Merge branch 'branch/3.6'

SIPp · Sep 22, 2020 · a284f3a · a284f3a
2 parents 05747d2 + b208545
commit a284f3a
Show file tree

Hide file tree

Showing 11 changed files with 145 additions and 164 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,10 @@ cmake_install.cmake
 # Ignore *.xml in root dir, but not in regression tests dir.
 /*.xml
 
+# Sphinx build
+/docs/_build
+*.pyc
+
 # Ignore autogenerated version.h.
 /include/version.cmake
 /version.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,7 +121,7 @@ file(WRITE ${PROJECT_SOURCE_DIR}/include/version.cmake
 ")
 add_custom_target(
     version
-    if test -d .git \; then
+    if test -d ${PROJECT_SOURCE_DIR}/.git \; then
         ${CMAKE_COMMAND} -D SRC=${PROJECT_SOURCE_DIR}/include/version.h.in
         -D DST=${PROJECT_BINARY_DIR}/version.h
         -P ${PROJECT_SOURCE_DIR}/include/version.cmake \;

diff --git a/docs/.gitignore b/docs/.gitignore
diff --git a/include/auth.hpp b/include/auth.hpp
@@ -24,7 +24,8 @@ int createAuthHeader(const char *user,
                      const char *aka_AMF,
                      const char *aka_K,
                      unsigned int nonce_count,
-                     char *result);
+                     char *result,
+                     size_t result_len);
 int verifyAuthHeader(const char *user, const char *password,
                      const char *method, const char *auth,
                      const char *msgbody);

diff --git a/include/screen.hpp b/include/screen.hpp
@@ -46,8 +46,8 @@ extern int key_dc;
 class ScreenPrinter {
 public:
     ScreenPrinter():
-        M_last(false),
-        M_headless(!isatty(fileno(stdout)))
+        M_headless(!isatty(fileno(stdout))),
+        M_last(false)
     {};
     void redraw();
     void print_closing_stats();

diff --git a/include/sipp.hpp b/include/sipp.hpp
@@ -238,7 +238,7 @@ MAYBE_EXTERN int                max_sched_loops         DEFVAL(MAX_SCHED_LOOPS_P
 MAYBE_EXTERN unsigned int       global_t2               DEFVAL(DEFAULT_T2_TIMER_VALUE);
 
 MAYBE_EXTERN char               local_ip[127];          /* also used for hostnames */
-MAYBE_EXTERN char               local_ip_escaped[42];   /* with [brackets] in case of IPv6 */
+MAYBE_EXTERN char               local_ip_w_brackets[42]; /* with [brackets] in case of IPv6 */
 MAYBE_EXTERN bool               local_ip_is_ipv6;
 MAYBE_EXTERN int                local_port              DEFVAL(0);
 #ifdef USE_SCTP
@@ -277,7 +277,7 @@ MAYBE_EXTERN int                media_port              DEFVAL(0);
 MAYBE_EXTERN size_t             media_bufsize           DEFVAL(2048);
 MAYBE_EXTERN bool               media_ip_is_ipv6        DEFVAL(false);
 MAYBE_EXTERN char               remote_ip[127];         /* also used for hostnames */
-MAYBE_EXTERN char               remote_ip_escaped[42];  /* with [brackets] in case of IPv6 */
+MAYBE_EXTERN char               remote_ip_w_brackets[42]; /* with [brackets] in case of IPv6 */
 MAYBE_EXTERN int                remote_port             DEFVAL(DEFAULT_PORT);
 MAYBE_EXTERN unsigned int       pid                     DEFVAL(0);
 MAYBE_EXTERN bool               print_all_responses     DEFVAL(false);