Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/sip-router
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Thu, 5 Mar 2009 17:43:52 +0000 (18:43 +0100)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Thu, 5 Mar 2009 17:43:52 +0000 (18:43 +0100)
* 'ser_core_cvs' of ssh://git.sip-router.org/sip-router:
  tcp: config option to disable active connects
  tcp: async mode on by default
  tcp: enable runtime changing for most of the cfg vars
  tcp: use dynamic config framework, part 2
  tcp: use dynamic config framework, part 1
  test: updated parse uri test program
  sctp: rpc info command
  sctp: connection reuse & connection tracking
  sctp: empty  sctp_handle_assoc_change added
  regfree() function call is added to free the memory allocated by regcomp().

Conflicts:
usr_avp.c - regex free fix from sip-router conflicted with the
            one from ser (they were the same)

1  2 
NEWS
cfg.lex
cfg.y
core_cmd.c
main.c
usr_avp.c

diff --cc NEWS
Simple merge
diff --cc cfg.lex
Simple merge
diff --cc cfg.y
--- 1/cfg.y
--- 2/cfg.y
+++ b/cfg.y
@@@ -828,25 -779,25 +829,25 @@@ assign_stm
                #endif
        }
        | TCP_CHILDREN EQUAL error { yyerror("number expected"); }
 -      | TCP_CONNECT_TIMEOUT EQUAL NUMBER {
 +      | TCP_CONNECT_TIMEOUT EQUAL intno {
                #ifdef USE_TCP
-                       tcp_connect_timeout=$3;
+                       tcp_default_cfg.connect_timeout_s=$3;
                #else
                        warn("tcp support not compiled in");
                #endif
        }
        | TCP_CONNECT_TIMEOUT EQUAL error { yyerror("number expected"); }
 -      | TCP_SEND_TIMEOUT EQUAL NUMBER {
 +      | TCP_SEND_TIMEOUT EQUAL intno {
                #ifdef USE_TCP
-                       tcp_send_timeout=$3;
+                       tcp_default_cfg.send_timeout_s=$3;
                #else
                        warn("tcp support not compiled in");
                #endif
        }
        | TCP_SEND_TIMEOUT EQUAL error { yyerror("number expected"); }
 -      | TCP_CON_LIFETIME EQUAL NUMBER {
 +      | TCP_CON_LIFETIME EQUAL intno {
                #ifdef USE_TCP
-                       tcp_con_lifetime=$3;
+                       tcp_default_cfg.con_lifetime_s=$3;
                #else
                        warn("tcp support not compiled in");
                #endif
diff --cc core_cmd.c
Simple merge
diff --cc main.c
Simple merge
diff --cc usr_avp.c
Simple merge