Merge commit 'origin/ser_core_cvs'
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Fri, 26 Jun 2009 18:25:09 +0000 (20:25 +0200)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Fri, 26 Jun 2009 18:25:09 +0000 (20:25 +0200)
* commit 'origin/ser_core_cvs': (22 commits)
  sctp: sctp_max_assocs support from the script
  sctp: core.sctp_options shows now also sctp_max_assocs
  sctp: max_assocs options
  sctp: sctp_assoc_tracking support from the script
  sctp: core.sctp_options shows now also sctp_assoc_tracking
  sctp:  assoc_tracking option
  sctp: SCTP_PEER_ADDR_PARAMS fix for older kernels
  sctp: assoc_reuse option
  core: cfg vars for the new sctp options
  core: sctp_options rpc updated
  sctp: more config variables
  tcp: remove unused var. decls
  dns: fix missing out-of-memory check
  - @next_hop.src_ip: source ip of outgoing message
  sctp: retransmission options
  sctp: sctp autoclose can now be changed at runtime
  sctp: enable runtime changing for some of the cfg vars
  tcp: minor fix: TCP_EV_IDLE_CONN_CLOSED
  tcp: minor fix: TCP_EV_CONNECT_RST() not always called
  sctp: compatibility with older linux kernels
  ...

1  2 
NEWS
cfg.lex
cfg.y
core_cmd.c
dns_cache.c
main.c
select_core.c
select_core.h

diff --cc NEWS
Simple merge
diff --cc cfg.lex
Simple merge
diff --cc cfg.y
--- 1/cfg.y
--- 2/cfg.y
+++ b/cfg.y
        #define IF_STUN(x) warn("stun support not compiled in")
  #endif
  
+ #ifdef USE_SCTP
+       #define IF_SCTP(x) x
+ #else
+       #define IF_SCTP(x) warn("sctp support not compiled in")
+ #endif
  
  extern int yylex();
 -static void yyerror(char* s);
 +static void yyerror(char* s, ...);
 +static void yyerror_at(struct cfg_pos* pos, char* s, ...);
  static char* tmp;
  static int i_tmp;
 +static unsigned u_tmp;
  static struct socket_id* lst_tmp;
  static struct name_lst*  nl_tmp;
  static int rt;  /* Type of route block for find_export */
diff --cc core_cmd.c
Simple merge
diff --cc dns_cache.c
Simple merge
diff --cc main.c
Simple merge
diff --cc select_core.c
Simple merge
diff --cc select_core.h
Simple merge