sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:andrei/blst_send_flags: core: cfg script support for blacklist ignore masks
by Andrei Pelinescu-Onciul 17 Feb '10

17 Feb '10

Module: sip-router Branch: andrei/blst_send_flags Commit: 0e055147442c58c2d029702fa618e448da9cf98f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e05514… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 09:58:21 2010 +0100 core: cfg script support for blacklist ignore masks The blacklist ignore mask can now be set from the script (not only at runtime): dst_blacklist_udp_imask dst_blacklist_tcp_imask dst_blacklist_tls_imask dst_blacklist_sctp_imask E.g. dst_blacklist_udp_imask=16 Possible values: 0 -disabled 2 - send error 4 - connect error 8 - icmp (reserverd for future use) 16 - transaction timeout 32 - administratively prohibited (manually set) --- cfg.lex | 13 +++++++++++++ cfg.y | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/cfg.lex b/cfg.lex index 61e694e..799b606 100644 --- a/cfg.lex +++ b/cfg.lex @@ -80,6 +80,7 @@ * 2009-03-10 added SET_USERPHONE action (Miklos) * 2009-04-24 add strlen, strempty and defined operators (andrei) * 2009-03-07 RETCODE, it's now a core pvar (andrei) + * 2010-02-17 added DST_BLST_{UDP,TCP,TLS,SCTP}_IMASK (andrei) */ @@ -343,6 +344,10 @@ USE_DST_BLST use_dst_blacklist DST_BLST_MEM dst_blacklist_mem DST_BLST_TTL dst_blacklist_expire|dst_blacklist_ttl DST_BLST_GC_INT dst_blacklist_gc_interval +DST_BLST_UDP_IMASK dst_blacklist_udp_imask +DST_BLST_TCP_IMASK dst_blacklist_tcp_imask +DST_BLST_TLS_IMASK dst_blacklist_tls_imask +DST_BLST_SCTP_IMASK dst_blacklist_sctp_imask PORT port @@ -680,6 +685,14 @@ EAT_ABLE [\ \t\b\r] return DST_BLST_TTL; } <INITIAL>{DST_BLST_GC_INT} { count(); yylval.strval=yytext; return DST_BLST_GC_INT; } +<INITIAL>{DST_BLST_UDP_IMASK} { count(); yylval.strval=yytext; + return DST_BLST_UDP_IMASK; } +<INITIAL>{DST_BLST_TCP_IMASK} { count(); yylval.strval=yytext; + return DST_BLST_TCP_IMASK; } +<INITIAL>{DST_BLST_TLS_IMASK} { count(); yylval.strval=yytext; + return DST_BLST_TLS_IMASK; } +<INITIAL>{DST_BLST_SCTP_IMASK} { count(); yylval.strval=yytext; + return DST_BLST_SCTP_IMASK; } <INITIAL>{PORT} { count(); yylval.strval=yytext; return PORT; } <INITIAL>{STAT} { count(); yylval.strval=yytext; return STAT; } <INITIAL>{MAXBUFFER} { count(); yylval.strval=yytext; return MAXBUFFER; } diff --git a/cfg.y b/cfg.y index 234b2d0..22c6dd4 100644 --- a/cfg.y +++ b/cfg.y @@ -96,6 +96,7 @@ * 2009-01-26 case/switch() support (andrei) * 2009-03-10 added SET_USERPHONE action (Miklos) * 2009-05-04 switched if to rval_expr (andrei) + * 2010-02-17 added blacklist imask (DST_BLST_*_IMASK) support (andrei) */ %{ @@ -398,6 +399,10 @@ extern char *finame; %token DST_BLST_MEM %token DST_BLST_TTL %token DST_BLST_GC_INT +%token DST_BLST_UDP_IMASK +%token DST_BLST_TCP_IMASK +%token DST_BLST_TLS_IMASK +%token DST_BLST_SCTP_IMASK %token PORT %token STAT @@ -834,14 +839,36 @@ assign_stm: | DNS_CACHE_DEL_NONEXP error { yyerror("boolean value expected"); } | DST_BLST_INIT EQUAL NUMBER { IF_DST_BLACKLIST(dst_blacklist_init=$3); } | DST_BLST_INIT error { yyerror("boolean value expected"); } - | USE_DST_BLST EQUAL NUMBER { IF_DST_BLACKLIST(default_core_cfg.use_dst_blacklist=$3); } + | USE_DST_BLST EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.use_dst_blacklist=$3); + } | USE_DST_BLST error { yyerror("boolean value expected"); } - | DST_BLST_MEM EQUAL NUMBER { IF_DST_BLACKLIST(default_core_cfg.blst_max_mem=$3); } + | DST_BLST_MEM EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_max_mem=$3); + } | DST_BLST_MEM error { yyerror("boolean value expected"); } - | DST_BLST_TTL EQUAL NUMBER { IF_DST_BLACKLIST(default_core_cfg.blst_timeout=$3); } + | DST_BLST_TTL EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_timeout=$3); + } | DST_BLST_TTL error { yyerror("boolean value expected"); } | DST_BLST_GC_INT EQUAL NUMBER { IF_DST_BLACKLIST(blst_timer_interval=$3);} | DST_BLST_GC_INT error { yyerror("boolean value expected"); } + | DST_BLST_UDP_IMASK EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_udp_imask=$3); + } + | DST_BLST_UDP_IMASK error { yyerror("number(flags) expected"); } + | DST_BLST_TCP_IMASK EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_tcp_imask=$3); + } + | DST_BLST_TCP_IMASK error { yyerror("number(flags) expected"); } + | DST_BLST_TLS_IMASK EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_tls_imask=$3); + } + | DST_BLST_TLS_IMASK error { yyerror("number(flags) expected"); } + | DST_BLST_SCTP_IMASK EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_sctp_imask=$3); + } + | DST_BLST_SCTP_IMASK error { yyerror("number(flags) expected"); } | PORT EQUAL NUMBER { port_no=$3; } | STAT EQUAL STRING { #ifdef STATS

1 0

git:master: dispatcher(k): basic framework for load dispatching
by Daniel-Constantin Mierla 15 Feb '10

15 Feb '10

Module: sip-router Branch: master Commit: 59c31fe72e95d60f42752bfcae3a18563b2c9700 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59c31fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 12 14:03:24 2010 +0100 dispatcher(k): basic framework for load dispatching - a lightweight system to do a fair distrubution based on load - no dependency on dialog, by using an internal table of active calls with minimal info, to keep the module suitable for small devices and have good performances - not completed, requires xavp support for a compact info structure to be carried in transaction for each failover step --- modules_k/dispatcher/dispatch.c | 94 ++++++++++++- modules_k/dispatcher/dispatch.h | 6 + modules_k/dispatcher/dispatcher.c | 10 ++ modules_k/dispatcher/ds_ht.c | 278 +++++++++++++++++++++++++++++++++++++ modules_k/dispatcher/ds_ht.h | 67 +++++++++ 5 files changed, 453 insertions(+), 2 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=59c…

3 4

git:andrei/blst_send_flags: blst: global config variables for ignoring blacklist events
by Andrei Pelinescu-Onciul 15 Feb '10

15 Feb '10

Module: sip-router Branch: andrei/blst_send_flags Commit: 0f9e9908055fe15d26d953f5477559254ef37436 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f9e990… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 15 21:37:28 2010 +0100 blst: global config variables for ignoring blacklist events Blacklist events can now be ignored on a per protocol basis, by setting the corresponding new config variable: dst_blacklist_udp_imask dst_blacklist_tcp_imask dst_blacklist_tls_imask dst_blacklist_sctp_imask E.g.: sercmd cfg.set_now_int core dst_blacklist_tcp_imask 6 (ignore send and connect errors on tcp when deciding whether or not to blacklist) --- cfg_core.c | 15 ++++++++++++++- cfg_core.h | 4 ++++ dst_blacklist.c | 36 ++++++++++++++++++++++++++++++++++++ dst_blacklist.h | 12 +++++++++--- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/cfg_core.c b/cfg_core.c index edebb9b..6f91740 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -54,6 +54,10 @@ struct cfg_group_core default_core_cfg = { 0, /* dst blacklist is disabled by default */ DEFAULT_BLST_TIMEOUT, DEFAULT_BLST_MAX_MEM, + 0, /* blst_udp_imask */ + 0, /* blst_tcp_imask */ + 0, /* blst_tls_imask */ + 0, /* blst_sctp_imask */ #endif /* resolver */ #ifdef USE_IPV6 @@ -114,7 +118,16 @@ cfg_def_t core_cfg_def[] = { {"dst_blacklist_expire", CFG_VAR_INT, 0, 0, 0, 0, "how much time (in s) a blacklisted destination is kept in the list"}, {"dst_blacklist_mem", CFG_VAR_INT, 0, 0, blst_max_mem_fixup, 0, - "maximum shared memory amount (in KB) used for keeping the blacklisted destinations"}, + "maximum shared memory amount (in KB) used for keeping the blacklisted" + " destinations"}, + {"dst_blacklist_udp_imask", CFG_VAR_INT, 0, 0, 0, blst_reinit_ign_masks, + "blacklist event ignore mask for UDP"}, + {"dst_blacklist_tcp_imask", CFG_VAR_INT, 0, 0, 0, blst_reinit_ign_masks, + "blacklist event ignore mask for TCP"}, + {"dst_blacklist_tls_imask", CFG_VAR_INT, 0, 0, 0, blst_reinit_ign_masks, + "blacklist event ignore mask for TLS"}, + {"dst_blacklist_sctp_imask", CFG_VAR_INT, 0, 0, 0, blst_reinit_ign_masks, + "blacklist event ignore mask for SCTP"}, #endif /* resolver */ #ifdef USE_DNS_CACHE diff --git a/cfg_core.h b/cfg_core.h index b37aacc..9fa26f6 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -54,6 +54,10 @@ struct cfg_group_core { unsigned int blst_timeout; /* blacklist entry ttl */ unsigned int blst_max_mem; /* maximum memory used for the blacklist entries */ + unsigned int blst_udp_imask; /* ignore mask for udp */ + unsigned int blst_tcp_imask; /* ignore mask for tcp */ + unsigned int blst_tls_imask; /* ignore mask for tls */ + unsigned int blst_sctp_imask; /* ignore mask for sctp */ #endif /* resolver */ int dns_try_ipv6; diff --git a/dst_blacklist.c b/dst_blacklist.c index 2c3653b..0e22727 100644 --- a/dst_blacklist.c +++ b/dst_blacklist.c @@ -136,6 +136,9 @@ struct dst_blst_lst_head* dst_blst_hash=0; struct t_dst_blacklist_stats* dst_blacklist_stats=0; #endif +/* blacklist per protocol event ignore mask array */ +unsigned blst_proto_imask[PROTO_LAST+1]; + #ifdef DST_BLACKLIST_HOOKS /* there 2 types of callbacks supported: on add new entry to the blacklist @@ -296,6 +299,26 @@ inline static int blacklist_run_hooks(struct blst_callbacks_lst *cb_lst, #endif /* DST_BLACKLIST_HOOKS */ +/** init per protocol blacklist event ignore masks. + * @return 0 on success, < 0 on error. + */ +int blst_init_ign_masks() +{ + if ((PROTO_UDP > PROTO_LAST) || (PROTO_TCP > PROTO_LAST) || + (PROTO_TLS > PROTO_LAST) || (PROTO_SCTP > PROTO_LAST)){ + BUG("protocol array too small\n"); + return -1; + } + blst_proto_imask[PROTO_UDP]=cfg_get(core, core_cfg, blst_udp_imask); + blst_proto_imask[PROTO_TCP]=cfg_get(core, core_cfg, blst_tcp_imask); + blst_proto_imask[PROTO_TLS]=cfg_get(core, core_cfg, blst_tls_imask); + blst_proto_imask[PROTO_SCTP]=cfg_get(core, core_cfg, blst_sctp_imask); + blst_proto_imask[PROTO_NONE]=blst_proto_imask[PROTO_UDP]; + return 0; +} + + + inline static void blst_destroy_entry(struct dst_blst_entry* e) { shm_free(e); @@ -478,6 +501,10 @@ int init_dst_blacklist() goto error; } } + if (blst_init_ign_masks() < 0){ + ret=E_BUG; + goto error; + } return 0; error: destroy_dst_blacklist(); @@ -1197,5 +1224,14 @@ int blst_max_mem_fixup(void *handle, str *gname, str *name, void **val) return 0; } + + +/** re-inint per child blst_proto_ign_mask array. */ +void blst_reinit_ign_masks(str* gname, str* name) +{ + blst_init_ign_masks(); +} + + #endif /* USE_DST_BLACKLIST */ diff --git a/dst_blacklist.h b/dst_blacklist.h index 175ce78..c079167 100644 --- a/dst_blacklist.h +++ b/dst_blacklist.h @@ -65,6 +65,9 @@ #define DST_BLACKLIST_ADD_CB 1 #define DST_BLACKLIST_SEARCH_CB 2 + +extern unsigned blst_proto_imask[PROTO_LAST+1]; + #ifdef DST_BLACKLIST_HOOKS struct blacklist_hook{ /* WARNING: msg might be NULL, and it might point to shared memory @@ -109,14 +112,15 @@ int dst_blacklist_force_su_to( unsigned char err_flags, /** checks if blacklist should be used. * @param err_flags - blacklist reason - * @param si - filled dst_info structure pointer. + * @param si - filled dest_info structure pointer. * @return 1 if blacklist is enabled (core_cfg) and the event/error * is not in the ignore list. * 0 otherwise */ #define should_blacklist(err_flags, si) \ (cfg_get(core, core_cfg, use_dst_blacklist) && \ - ((err_flags) & (si)->send_flags.blst_imask)) + ((err_flags) & ~blst_proto_imask[(unsigned)((si)->proto)] & \ + ~(si)->send_flags.blst_imask )) /** checks if blacklist should be used, long version. @@ -130,7 +134,7 @@ int dst_blacklist_force_su_to( unsigned char err_flags, */ #define should_blacklist_su(err_flags, snd_flags, proto, su) \ (cfg_get(core, core_cfg, use_dst_blacklist) && \ - ((err_flags) & \ + ((err_flags) & ~blst_proto_imask[(unsigned)(proto)] & \ ~((snd_flags)?((snd_flags_t*)(snd_flags))->blst_imask:0))) @@ -205,4 +209,6 @@ int use_dst_blacklist_fixup(void *handle, str *gname, str *name, void **val); /* KByte to Byte conversion */ int blst_max_mem_fixup(void *handle, str *gname, str *name, void **val); +void blst_reinit_ign_masks(str* gname, str* name); + #endif

1 0

git:master: Merge remote branch 'origin/daniel/xavp'
by Andrei Pelinescu-Onciul 15 Feb '10

15 Feb '10

Module: sip-router Branch: master Commit: 98529eaf530122f8cf4fbe8115c48c3400d764fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98529ea… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 15 15:47:37 2010 +0100 Merge remote branch 'origin/daniel/xavp' * origin/daniel/xavp: pv: export new PV class $xavp(name) core: introducing xavp (eXtended AVP) tm: set/reset head of xavps on TM events pv: new pv class $xavp(...) core: destroy xavp list once sip msg processing is done Conflicts: modules/tm/h_table.c modules/tm/t_reply.c modules/tm/uac.c modules_k/pv/pv.c ---

1 0

git:sr_3.0: Merge remote branch 'origin/tmp/k3.0_sr_backports' into sr_3.0
by Andrei Pelinescu-Onciul 15 Feb '10

15 Feb '10

Module: sip-router Branch: sr_3.0 Commit: 385ce10271569852982007ebb927d2b6a5e5af40 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=385ce10… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 15 13:25:03 2010 +0100 Merge remote branch 'origin/tmp/k3.0_sr_backports' into sr_3.0 * origin/tmp/k3.0_sr_backports: modules/mediaproxy: properly fix the IP in the RTCP line utils/kamctl: removed unsupported commands to manage lcr gateways and routes cfg.y: fix warnings introduced in previous commit core: added forward() Makefile: MEMDBG var to control mem debugging mode ---

1 0

git:tmp/k3.0_sr_backports: modules/mediaproxy: properly fix the IP in the RTCP line
by Andrei Pelinescu-Onciul 15 Feb '10

15 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: c80f76803d771997d33a4b26f7249e6888103c12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c80f768… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 11 22:22:12 2010 +0200 modules/mediaproxy: properly fix the IP in the RTCP line - Properly fix the IP in the RTCP line (if present in the SDP). Patch provided by Saul Ibarra Corretge. (cherry picked from commit 2a95f9bf915cfc3cf11374f9b8f0f547d4eb4955) (cherry picked from commit ef10212404b9bc5489683fc7429fee40b3495994) --- modules/mediaproxy/mediaproxy.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index acedf5b..ff633ba 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -127,6 +127,7 @@ typedef struct { str type; // stream type (`audio', `video', `image', ...) str ip; str port; + str rtcp_ip; // pointer to the rtcp IP if explicitly specified by stream str rtcp_port; // pointer to the rtcp port if explicitly specified by stream str direction; Bool local_ip; // true if the IP is locally defined inside this media stream @@ -827,6 +828,34 @@ get_rtcp_port_attribute(str *block) } +// will return the rtcp IP of the stream in the given block +// if defined by the stream, otherwise will return {NULL, 0}. +static str +get_rtcp_ip_attribute(str *block) +{ + str zone, tokens[4], undefined = {NULL, 0}; + char *ptr; + int count; + + ptr = find_line_starting_with(block, "a=rtcp:", False); + + if (!ptr) + return undefined; + + zone.s = ptr + 7; + zone.len = findendline(zone.s, block->s + block->len - zone.s) - zone.s; + + count = get_str_tokens(&zone, tokens, 4); + + if (count != 4) { + LM_ERR("invalid `a=rtcp' line in SDP body\n"); + return undefined; + } + + return tokens[3]; +} + + // will return the ip address present in a `c=' line in the given block // returns: -1 on error, 0 if not found, 1 if found static int @@ -1073,6 +1102,7 @@ get_session_info(str *sdp, SessionInfo *session) session->streams[i].local_ip = 1; } + session->streams[i].rtcp_ip = get_rtcp_ip_attribute(&block); session->streams[i].rtcp_port = get_rtcp_port_attribute(&block); session->streams[i].direction = get_direction_attribute(&block, &session->direction); } @@ -1491,6 +1521,13 @@ use_media_proxy(struct sip_msg *msg, char *dialog_id) } } + if (stream.rtcp_ip.len > 0) { + if (!replace_element(msg, &stream.rtcp_ip, &tokens[0])) { + LM_ERR("failed to replace RTCP IP in media stream number %d\n", i+1); + return -1; + } + } + if (stream.local_ip && !isnulladdr(stream.ip)) { if (!replace_element(msg, &stream.ip, &tokens[0])) { LM_ERR("failed to replace IP address in media stream number %d\n", i+1);

1 0

git:tmp/k3.0_sr_backports: utils/kamctl: removed unsupported commands to manage lcr gateways and routes
by Andrei Pelinescu-Onciul 15 Feb '10

15 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 014da575f25556ece0a8500e822b97ad0eb74d26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=014da57… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 10 22:37:44 2010 +0200 utils/kamctl: removed unsupported commands to manage lcr gateways and routes (cherry picked from commit d8d9165324f32e82f6e8cbb5e07f33ddd697cd1d) --- utils/kamctl/kamctl.8 | 15 --------------- utils/kamctl/kamctl.base | 15 --------------- 2 files changed, 0 insertions(+), 30 deletions(-) diff --git a/utils/kamctl/kamctl.8 b/utils/kamctl/kamctl.8 index 4343a88..96c8787 100644 --- a/utils/kamctl/kamctl.8 +++ b/utils/kamctl/kamctl.8 @@ -57,26 +57,11 @@ Grant user membership(s) (*) .TP 16 .I Least cost routes (lcr) managment command: .TP -.B lcr show -Show gateways and routes tables -.TP .B lcr dump Show in memory gateways and routes tables .TP .B lcr reload Reload lcr gateways and routes -.TP -.B lcr addgw <gw_name> <ip> <port> <scheme> <transport> <grp_id> <flags> <tag> <strip> <weight> <hostname> <ping> -Add a gateway with flags, tag, strip, weight, hostname, and ping (flags, tag, strip, weight, hostname, and ping are optional) -.TP -.B lcr rmgw <gw_name> -Delete a gateway -.TP -.B lcr addroute <prefix> <from> <grp_id> <prio> -Add a route ( use '' to match anything in <from> ) -.TP -.B lcr rmroute <prefix> <from> <grp_id> <prio> -Delete a route .TP 16 .I Carrierroute tables('cr') managment commands: diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 3a3816d..79025c2 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -362,23 +362,8 @@ usage_lcr() { mecho " -- command 'lcr' - manage least cost routes (lcr)" echo cat <<EOF - * IP addresses must be entered in dotted quad format e.g. 1.2.3.4 * - * <uri_scheme> and <transport> must be entered in integer or text, * - * e.g. transport '2' is identical to transport 'tcp'. * - * scheme: 1=sip, 2=sips; transport: 1=udp, 2=tcp, 3=tls, 4=sctp * - * Examples: lcr addgw level3 1.2.3.4 5080 sip tcp 1 * - * lcr addroute +1 '' 1 1 * - lcr show .......... show gateways and routes tables lcr dump .......... show in memory gateways and routes tables lcr reload ........ reload lcr gateways and routes - lcr addgw <gw_name> <ip> <port> <scheme> <transport> <grp_id> <flags> <tag> <strip> <weight> <hostname> <ping> - ......... add a gateway with flags, tag, strip, weight, hostname, and ping - ......... (flags, tag, strip, weight, hostname, and ping are optional) - lcr rmgw <gw_name> delete a gateway - lcr addroute <prefix> <from> <grp_id> <prio> - ......... add a route ( use '' to match anything in <from> ) - lcr rmroute <prefix> <from> <grp_id> <prio> - ......... delete a route EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_lcr"

1 0

git:tmp/k3.0_sr_backports: Makefile: MEMDBG var to control mem debugging mode
by Andrei Pelinescu-Onciul 15 Feb '10

15 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: f5875992906022e491d059bd5c20662b192ac4fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f587599… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 8 23:16:47 2010 +0100 Makefile: MEMDBG var to control mem debugging mode - to compile with memory debugging make MEMDBG=1 cfg; make ... - default (for now): MEMDBG=1 --- Makefile.defs | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index eca85ad..de2cf24 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -146,6 +146,11 @@ PATCHLEVEL = 99 SUBLEVEL = 99 EXTRAVERSION = -pre3 +# memory debugger switcher +# 0 - off (release mode) +# 1 - on (devel mode) +MEMDBG ?= 1 + SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) ) RELEASE:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) @@ -613,15 +618,12 @@ C_DEFS= $(extra_defs) \ -DUSE_DNS_FAILOVER \ -DUSE_DST_BLACKLIST \ -DUSE_NAPTR \ - -DDBG_QM_MALLOC \ #-DUSE_DNS_CACHE_STATS \ #-DUSE_DST_BLACKLIST_STATS \ #-DDNS_WATCHDOG_SUPPORT \ #-DLL_MALLOC \ #-DSF_MALLOC \ #-DDL_MALLOC \ - #-DF_MALLOC \ - #-DDBG_QM_MALLOC \ #-DDBG_F_MALLOC \ #-DNO_DEBUG \ #-DEXTRA_DEBUG \ @@ -641,6 +643,11 @@ C_DEFS= $(extra_defs) \ # use make mode=debug all instead. Anyway no by default ser is compiled w/ # debugging symbols in all cases (-g). --andrei +ifeq ($(MEMDBG), 1) + C_DEFS+= -DDBG_QM_MALLOC +else + C_DEFS+= -DF_MALLOC +endif ifeq ($(CORE_TLS), 1) C_DEFS+= -DUSE_TLS -DCORE_TLS endif

1 0

git:tmp/k3.0_sr_backports: core: added forward()
by Andrei Pelinescu-Onciul 15 Feb '10

15 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: ec8f28160ffee8f381bcb44ba50cf5869186ac59 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec8f281… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 9 11:23:50 2010 +0100 core: added forward() - aliased forward() to forward(uri:host, uri:port) - k 1.5.x compatibility (cherry picked from commit 50237e89964b4fc8a4c8775076c1b75a05ee5e73) --- cfg.y | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index 4318728..9a87ef7 100644 --- a/cfg.y +++ b/cfg.y @@ -2725,7 +2725,8 @@ avpflag_oper: | ISAVPFLAGSET { $$ = -1; } ; cmd: - FORWARD LPAREN host RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } + | FORWARD LPAREN RPAREN { $$=mk_action(FORWARD_T, 2, URIHOST_ST, 0, URIPORT_ST, 0); set_cfg_pos($$); } + | FORWARD LPAREN host RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN STRING RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN ip RPAREN { $$=mk_action( FORWARD_T, 2, IP_ST, (void*)$3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN host COMMA NUMBER RPAREN { $$=mk_action(FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, (void*)$5); set_cfg_pos($$); }

1 0

git:tmp/k3.0_sr_backports: cfg.y: fix warnings introduced in previous commit
by Andrei Pelinescu-Onciul 15 Feb '10

15 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 4625ccb8e56b2b32834d987b897ef728b09ce0c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4625ccb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 9 11:32:02 2010 +0100 cfg.y: fix warnings introduced in previous commit (cherry picked from commit 318ff6e6884641f3c9788b01e9ac3d859269be30) --- cfg.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index 9a87ef7..2ca76bb 100644 --- a/cfg.y +++ b/cfg.y @@ -2725,7 +2725,7 @@ avpflag_oper: | ISAVPFLAGSET { $$ = -1; } ; cmd: - | FORWARD LPAREN RPAREN { $$=mk_action(FORWARD_T, 2, URIHOST_ST, 0, URIPORT_ST, 0); set_cfg_pos($$); } + FORWARD LPAREN RPAREN { $$=mk_action(FORWARD_T, 2, URIHOST_ST, 0, URIPORT_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN host RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN STRING RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN ip RPAREN { $$=mk_action( FORWARD_T, 2, IP_ST, (void*)$3, NUMBER_ST, 0); set_cfg_pos($$); }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2010