sr-dev

sr-dev@lists.kamailio.org

15 participants
44233 discussions

git:daniel/xavp: core: destroy xavp list once sip msg processing is done

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/xavp Commit: 4075c49e921b0f4bcc48b7f1922f5c01d4ea492b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4075c49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 30 12:15:30 2009 +0200 core: destroy xavp list once sip msg processing is done --- receive.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/receive.c b/receive.c index ac92867..b055183 100644 --- a/receive.c +++ b/receive.c @@ -59,6 +59,9 @@ #include "nonsip_hooks.h" #include "dset.h" #include "usr_avp.h" +#ifdef WITH_XAVP +#include "xavp.h" +#endif #include "select_buf.h" #include "tcp_server.h" /* for tcpconn_add_alias */ @@ -241,6 +244,9 @@ end: #endif /* free possible loaded avps -bogdan */ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif DBG("receive_msg: cleaning up\n"); free_sip_msg(msg); pkg_free(msg); @@ -252,6 +258,9 @@ error_rpl: /* execute post reply-script callbacks */ exec_post_script_cb(msg, ONREPLY_CB_TYPE); reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif goto error02; error_req: DBG("receive_msg: error:...\n"); @@ -259,6 +268,9 @@ error_req: exec_post_script_cb(msg, REQUEST_CB_TYPE); /* free possible loaded avps -bogdan */ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif error02: free_sip_msg(msg); pkg_free(msg);

15 years, 6 months

git:daniel/xavp: pv: new pv class $xavp(...)

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/xavp Commit: 81932f849238f2411b81ece9d2db12e94f0b1983 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81932f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 30 12:16:06 2009 +0200 pv: new pv class $xavp(...) - access XAVPs from the config via psuedo-variables --- modules_k/pv/pv.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index f990a55..9283828 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -35,7 +35,9 @@ #include "pv_shv.h" #include "pv_time.h" #include "pv_trans.h" - +#ifdef WITH_XAVP +#include "pv_xavp.h" +#endif MODULE_VERSION @@ -64,7 +66,11 @@ static pv_export_t mod_pvs[] = { { {"stat", sizeof("stat")-1}, /* statistics */ PVT_OTHER, pv_get_stat, 0, pv_parse_stat_name, 0, 0, 0 }, - +#ifdef WITH_XAVP + { {"xavp", sizeof("xavp")-1}, /* xavp */ + PVT_OTHER, pv_get_xavp, pv_set_xavp, + pv_parse_xavp_name, 0, 0, 0 }, +#endif {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, {{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name, @@ -387,6 +393,10 @@ static cmd_export_t cmds[]={ ANY_ROUTE }, {"pv_unset", (cmd_function)pv_unset, 1, fixup_pvar_null, 0, ANY_ROUTE }, +#ifdef WITH_XAVP + {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, + ANY_ROUTE }, +#endif {0,0,0,0,0,0} };

15 years, 6 months

git:daniel/xavp: tm: set/reset head of xavps on TM events

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/xavp Commit: 074517dbf60512194517666bbbf39125369b4624 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=074517d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 30 12:16:35 2009 +0200 tm: set/reset head of xavps on TM events --- modules/tm/h_table.c | 19 +++++++++++++++++++ modules/tm/h_table.h | 8 +++++++- modules/tm/t_hooks.c | 10 ++++++++++ modules/tm/t_reply.c | 21 +++++++++++++++++++++ modules/tm/uac.c | 3 +++ 5 files changed, 60 insertions(+), 1 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 11fb1a8..d536942 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -201,6 +201,10 @@ void free_cell( struct cell* dead_cell ) destroy_avp_list_unsafe( &dead_cell->uri_avps_from ); if (dead_cell->uri_avps_to) destroy_avp_list_unsafe( &dead_cell->uri_avps_to ); +#ifdef WITH_XAVP + if (dead_cell->xavps_list) + xavp_destroy_list_unsafe( &dead_cell->xavps_list ); +#endif /* the cell's body */ shm_free_unsafe( dead_cell ); @@ -266,6 +270,9 @@ struct cell* build_cell( struct sip_msg* p_msg ) struct cell* new_cell; int sip_msg_len; avp_list_t* old; +#ifdef WITH_XAVP + sr_xavp_t** xold; +#endif /* allocs a new cell */ /* if syn_branch==0 add space for md5 (MD5_LEN -sizeof(struct cell.md5)) */ @@ -305,6 +312,12 @@ struct cell* build_cell( struct sip_msg* p_msg ) new_cell->user_avps_to = *old; *old = 0; +#ifdef WITH_XAVP + xold = xavp_set_list(&new_cell->xavps_list ); + new_cell->xavps_list = *xold; + *xold = 0; +#endif + /* We can just store pointer to domain avps in the transaction context, * because they are read-only */ @@ -347,9 +360,15 @@ error: destroy_avp_list(&new_cell->user_avps_to); destroy_avp_list(&new_cell->uri_avps_from); destroy_avp_list(&new_cell->uri_avps_to); +#ifdef WITH_XAVP + xavp_destroy_list(&new_cell->xavps_list); +#endif shm_free(new_cell); /* unlink transaction AVP list and link back the global AVP list (bogdan)*/ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif return NULL; } diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index d6c36e4..1528039 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -69,6 +69,9 @@ #include "../../types.h" #include "../../md5utils.h" #include "../../usr_avp.h" +#ifdef WITH_XAVP +#include "../../xavp.h" +#endif #include "../../timer.h" #include "../../flags.h" #include "../../atomic_ops.h" @@ -356,7 +359,10 @@ typedef struct cell struct usr_avp *user_avps_to; struct usr_avp *domain_avps_from; struct usr_avp *domain_avps_to; - +#ifdef WITH_XAVP + sr_xavp_t *xavps_list; +#endif + /* protection against concurrent reply processing */ ser_lock_t reply_mutex; diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index 6e149ea..ceb3c24 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -230,6 +230,9 @@ void run_trans_callbacks_internal(struct tmcb_head_list* cb_lst, int type, { struct tm_callback *cbp; avp_list_t* backup_from, *backup_to, *backup_dom_from, *backup_dom_to, *backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + sr_xavp_t **backup_xavps; +#endif backup_uri_from = set_avp_list(AVP_CLASS_URI | AVP_TRACK_FROM, &trans->uri_avps_from ); @@ -243,6 +246,10 @@ void run_trans_callbacks_internal(struct tmcb_head_list* cb_lst, int type, &trans->domain_avps_from); backup_dom_to = set_avp_list(AVP_CLASS_DOMAIN | AVP_TRACK_TO, &trans->domain_avps_to); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&trans->xavps_list); +#endif + cbp=(struct tm_callback*)cb_lst->first; while(cbp){ membar_depends(); /* make sure the cache has the correct cbp @@ -261,6 +268,9 @@ void run_trans_callbacks_internal(struct tmcb_head_list* cb_lst, int type, set_avp_list(AVP_CLASS_USER | AVP_TRACK_FROM, backup_from ); set_avp_list(AVP_CLASS_URI | AVP_TRACK_TO, backup_uri_to ); set_avp_list(AVP_CLASS_URI | AVP_TRACK_FROM, backup_uri_from ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif } diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 3d46f6f..3bcf8c9 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -114,6 +114,9 @@ #include "../../data_lump.h" #include "../../data_lump_rpl.h" #include "../../usr_avp.h" +#ifdef WITH_XAVP +#include "../../usr_avp.h" +#endif #include "../../atomic_ops.h" /* membar_write() */ #include "../../compiler_opt.h" #ifdef USE_DST_BLACKLIST @@ -684,6 +687,9 @@ void faked_env( struct cell *t, struct sip_msg *msg) static avp_list_t* backup_user_from, *backup_user_to; static avp_list_t* backup_domain_from, *backup_domain_to; static avp_list_t* backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + static sr_xavp_t **backup_xavps; +#endif static struct socket_info* backup_si; if (msg) { @@ -714,6 +720,9 @@ void faked_env( struct cell *t, struct sip_msg *msg) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&t->xavps_list); +#endif /* set default send address to the saved value */ backup_si=bind_address; bind_address=t->uac[0].request.dst.send_sock; @@ -729,6 +738,9 @@ void faked_env( struct cell *t, struct sip_msg *msg) set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to ); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from ); set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif bind_address=backup_si; } } @@ -1826,6 +1838,9 @@ int reply_received( struct sip_msg *p_msg ) avp_list_t* backup_user_from, *backup_user_to; avp_list_t* backup_domain_from, *backup_domain_to; avp_list_t* backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + sr_xavp_t **backup_xavps; +#endif #ifdef USE_DNS_FAILOVER int branch_ret; int prev_branch; @@ -1972,6 +1987,9 @@ int reply_received( struct sip_msg *p_msg ) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&t->xavps_list); +#endif setbflagsval(0, uac->branch_flags); /* Pre- and post-script callbacks have already * been execueted by the core. (Miklos) @@ -1989,6 +2007,9 @@ int reply_received( struct sip_msg *p_msg ) set_avp_list( AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to ); set_avp_list( AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from ); set_avp_list( AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif } #ifdef USE_DST_BLACKLIST /* add temporary to the blacklist the source of a 503 reply */ diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 6dfd0fc..1a3ac5f 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -284,6 +284,9 @@ static inline int t_uac_prepare(uac_req_t *uac_r, /* better reset avp list now - anyhow, it's useless from * this point (bogdan) */ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif set_kr(REQ_FWDED);

15 years, 6 months

git:daniel/xavp: pv: export new PV class $xavp(name)

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/xavp Commit: d68a8b4db09c210f5281784a21731d6069605e58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d68a8b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 30 12:30:20 2009 +0200 pv: export new PV class $xavp(name) - allow management of XAVP from config file --- modules_k/pv/pv_xavp.c | 518 ++++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_xavp.h | 41 ++++ 2 files changed, 559 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d68…

15 years, 6 months

[ openser-Bugs-2814137 ] force_rtp_proxy bug

by SourceForge.net

Bugs item #2814137, was opened at 2009-06-29 19:29 Message generated for change (Comment added) made by marcushunger You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2814137&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Marcus Hunger (marcushunger) Assigned to: Nobody/Anonymous (nobody) Summary: force_rtp_proxy bug Initial Comment: force_rtp_proxy seems to handle re-invite wrong, resulting in one-way-audio. ---------------------------------------------------------------------- Comment By: Marcus Hunger (marcushunger) Date: 2009-06-30 11:45 Message: happens when i handle a reinvite with rtpproxy_offer("l") ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-06-29 20:19 Message: When is this happening? ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2814137&group_…

15 years, 6 months

[ openser-Bugs-2813924 ] nathelper crash

by SourceForge.net

Bugs item #2813924, was opened at 2009-06-29 13:55 Message generated for change (Comment added) made by marcushunger You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2813924&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Marcus Hunger (marcushunger) Assigned to: Nobody/Anonymous (nobody) Summary: nathelper crash Initial Comment: publishing very long payload-type to the rtp-proxy overflows a buffer. see nathelper.c +2758. v[1].iov_len must be smaller than sizeof(opts) ---------------------------------------------------------------------- Comment By: Marcus Hunger (marcushunger) Date: 2009-06-30 11:41 Message: ah, sorry, you're right. ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-06-30 11:06 Message: Did you meant '&&' operator instead of ',' in for condition? Otherwise: warning: left-hand operand of comma expression has no effect ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2813924&group_…

15 years, 6 months

[tracker] Task opened: speex, sems and mi_datagram with quotes

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Daniel-Constantin Mierla (miconda) Attached to Project - sip-router Summary - speex, sems and mi_datagram with quotes Task Type - Bug Report Category - Core Status - New Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - speex payload format was published as an rfc last week and the last change before publication was the addition of the "quote" for the mode parameter. a=fmtp:98 mode="6,any" It's pretty clear that the '"' character is messing up the mi_datagram exchange. Here is the capture: http://sip.antisip.com/call-sdp-with-quote.pcap More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=7 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

15 years, 6 months

[tracker] Task closed: msilo m_dump() does not notice de-registration

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#3 - msilo m_dump() does not notice de-registration User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Fix in trunk More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=3 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

15 years, 6 months

[tracker] Task closed: Multipart SDP problem in Nathelper

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#6 - Multipart SDP problem in Nathelper User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=6 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

15 years, 6 months

[tracker] Comment added: Multipart SDP problem in Nathelper

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#6 - Multipart SDP problem in Nathelper User who did this - Daniel-Constantin Mierla (miconda) ---------- All seems fine so far! Backported to K 1.5 branch. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=6#comment4 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

15 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev