sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: Merge remote branch 'origin/daniel/xavp'

by Andrei Pelinescu-Onciul

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 ---

14 years, 11 months

git:sr_3.0: Merge remote branch 'origin/tmp/k3.0_sr_backports' into sr_3.0

by Andrei Pelinescu-Onciul

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 ---

14 years, 11 months

git:tmp/k3.0_sr_backports: modules/mediaproxy: properly fix the IP in the RTCP line

by Andrei Pelinescu-Onciul

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);

14 years, 11 months

git:tmp/k3.0_sr_backports: cfg.y: fix warnings introduced in previous commit

by Andrei Pelinescu-Onciul

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($$); }

14 years, 11 months

git:tmp/k3.0_sr_backports: core: added forward()

by Andrei Pelinescu-Onciul

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($$); }

14 years, 11 months

git:tmp/k3.0_sr_backports: Makefile: MEMDBG var to control mem debugging mode

by Andrei Pelinescu-Onciul

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

14 years, 11 months

git:tmp/k3.0_sr_backports: utils/kamctl: removed unsupported commands to manage lcr gateways and routes

by Andrei Pelinescu-Onciul

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"

14 years, 11 months

SF.net SVN: openser:[5988] branches/1.5/modules/sqlops

by Daniel-Constantin Mierla

Revision: 5988 http://openser.svn.sourceforge.net/openser/?rev=5988&view=rev Author: miconda Date: 2010-02-12 17:52:05 +0000 (Fri, 12 Feb 2010) Log Message: ----------- - use sql_result_free() in example - exaple of this function was missing its usage - reported by Marco B Modified Paths: -------------- branches/1.5/modules/sqlops/README branches/1.5/modules/sqlops/doc/sqlops_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 11 months

git:master: dialog(k): init local parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 787fabb1e0085355aa1eeb77d5f17e7940f4ed3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=787fabb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 12 11:12:37 2010 +0100 dialog(k): init local parameter - memset tm callback param to 0 - safety checks for MI cmd dlg match - credits to Inaki Baz Castillo and Torben Friese --- modules_k/dialog/dlg_handlers.c | 34 ++++++++++++++++++++-------------- modules_k/dialog/dlg_hash.h | 2 ++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 450cc12..1091777 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -331,24 +331,29 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) old_state!=DLG_STATE_CONFIRMED_NA && old_state!=DLG_STATE_CONFIRMED ) { LM_DBG("dialog %p confirmed\n",dlg); - /* get to tag*/ - if ( !rpl->to && ((parse_headers(rpl, HDR_TO_F,0)<0) || !rpl->to) ) { - LM_ERR("bad reply or missing TO hdr :-/\n"); - tag.s = 0; - tag.len = 0; - } else { - tag = get_to(rpl)->tag_value; - if (tag.s==0 || tag.len==0) { - LM_ERR("missing TAG param in TO hdr :-/\n"); + if (rpl != FAKED_REPLY) { + /* get to tag*/ + if ( !rpl->to && ((parse_headers(rpl, HDR_TO_F,0)<0) + || !rpl->to) ) { + LM_ERR("bad reply or missing TO hdr :-/\n"); tag.s = 0; tag.len = 0; + } else { + tag = get_to(rpl)->tag_value; + if (tag.s==0 || tag.len==0) { + LM_ERR("missing TAG param in TO hdr :-/\n"); + tag.s = 0; + tag.len = 0; + } } - } - /* save callee's tag, cseq, contact and record route*/ - if (populate_leg_info( dlg, rpl, t, DLG_CALLEE_LEG, &tag) !=0) { - LM_ERR("could not add further info to the dialog\n"); - } + /* save callee's tag, cseq, contact and record route*/ + if (populate_leg_info( dlg, rpl, t, DLG_CALLEE_LEG, &tag) !=0) { + LM_ERR("could not add further info to the dialog\n"); + } + } else { + LM_ERR("Faked reply!\n"); + } /* set start time */ dlg->start_ts = (unsigned int)(time(0)); @@ -500,6 +505,7 @@ static void unref_new_dialog(void *dialog) { struct tmcb_params p; + memset(&p, 0, sizeof(struct tmcb_params)); p.param = (void*)&dialog; dlg_onreply(0, TMCB_DESTROY, &p); } diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index bd1de87..889a318 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -426,6 +426,8 @@ static inline int match_dialog(struct dlg_cell *dlg, str *callid, */ static inline int match_downstream_dialog(struct dlg_cell *dlg, str *callid, str *ftag) { + if(dlg==NULL || callid==NULL || ftag==NULL) + return 0; if (dlg->callid.len!=callid->len || dlg->tag[DLG_CALLER_LEG].len!=ftag->len || strncmp(dlg->callid.s,callid->s,callid->len)!=0 ||

14 years, 11 months

SF.net SVN: openser:[5987] branches/1.5/modules/mediaproxy/mediaproxy.c

by Juha Heinanen

Revision: 5987 http://openser.svn.sourceforge.net/openser/?rev=5987&view=rev Author: juhe Date: 2010-02-12 08:57:48 +0000 (Fri, 12 Feb 2010) Log Message: ----------- * modules/mediaproxy: backport bug fix from sr contained sr specific code. Modified Paths: -------------- branches/1.5/modules/mediaproxy/mediaproxy.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev