sr-dev

sr-dev@lists.kamailio.org

15 participants
44218 discussions

git:andrei/path: registrar(s): updated to the new append_branch()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: d9ebb640e2d659aa5d76809b18c9b1241f69525c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9ebb64… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 4 15:23:44 2009 +0200 registrar(s): updated to the new append_branch() --- modules_s/registrar/lookup.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_s/registrar/lookup.c b/modules_s/registrar/lookup.c index 45fc577..6363518 100644 --- a/modules_s/registrar/lookup.c +++ b/modules_s/registrar/lookup.c @@ -164,7 +164,7 @@ skip_rewrite_uri: LOG(L_ERR, "ERROR: lookup(): branch: out of memory\n"); goto cont; /* try to continue */ } - if (append_branch(_m, new_uri.s, new_uri.len, 0, 0, ptr->q, 0) == -1) { + if (append_branch(_m, &new_uri, 0, 0, ptr->q, 0, 0) == -1) { LOG(L_ERR, "lookup(): Error while appending a branch\n"); pkg_free(new_uri.s); if (ser_error==E_TOO_MANY_BRANCHES) goto skip; @@ -173,8 +173,8 @@ skip_rewrite_uri: } pkg_free(new_uri.s); /* append_branch doesn't free it */ }else{ - if (append_branch(_m, ptr->c.s, ptr->c.len, ptr->received.s, - ptr->received.len, ptr->q, ptr->sock) == -1) { + if (append_branch(_m, &ptr->c, &ptr->received, 0 /* path */, + ptr->q, 0 /* brflags*/, ptr->sock) == -1) { LOG(L_ERR, "lookup(): Error while appending a branch\n"); goto skip; /* Return OK here so the function succeeds */ } @@ -326,7 +326,7 @@ skip_rewrite_uri: ERR("branch: out of memory\n"); goto cont; /* try to continue */ } - if (append_branch(msg, new_uri.s, new_uri.len, 0, 0, ptr->q, 0) == -1) { + if (append_branch(msg, &new_uri, 0, 0, ptr->q, 0, 0) == -1) { ERR("Error while appending a branch\n"); pkg_free(new_uri.s); if (ser_error == E_TOO_MANY_BRANCHES) goto skip; @@ -335,8 +335,8 @@ skip_rewrite_uri: } pkg_free(new_uri.s); /* append_branch doesn't free it */ } else { - if (append_branch(msg, ptr->c.s, ptr->c.len, ptr->received.s, - ptr->received.len, ptr->q, ptr->sock) == -1) { + if (append_branch(msg, &ptr->c, &ptr->received, 0 /* path */, + ptr->q, 0, ptr->sock) == -1) { ERR("Error while appending a branch\n"); goto skip; /* Return OK here so the function succeeds */ }

15 years, 4 months

git:andrei/path: core: path support when forwarding

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: d64d6bb9dd10499b83aa811557beb77714b74c5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d64d6bb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 8 19:21:49 2009 +0200 core: path support when forwarding Path support compatible with kamailio (although there might be differences in the added Route header position). --- msg_translator.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++- msg_translator.h | 3 +- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index e486579..42c1cf1 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1495,7 +1495,9 @@ error: /** builds a request in memory from another sip request. * * Side-effects: - it adds lumps to the msg which are _not_ cleaned. - * All the added lumps are HDR_VIA_T. + * The added lumps are HDR_VIA_T (almost always added), HDR_CONTENLENGTH_T + * and HDR_ROUTE_T (when a Route: header is added as a result of a non-null + * msg->path_vec). * - it might change send_info->proto and send_info->send_socket * if proto fallback is enabled (see below). * @@ -1516,8 +1518,16 @@ error: * message > mtu and send_info->proto==PROTO_UDP. * It will also update send_info->proto. * - FL_FORCE_RPORT: add rport to via + * @param mode - flags for building the message, can be a combination of: + * * BUILD_NO_LOCAL_VIA - don't add a local via + * * BUILD_NO_VIA1_UPDATE - don't update first via (rport, + * received a.s.o) + * * BUILD_NO_PATH - don't add a Route: header with the + * msg->path_vec content. + * * BUILD_IN_SHM - build the result in shm memory * - * @return pointer to the new request (pkg_malloc'ed, needs freeing when + * @return pointer to the new request (pkg_malloc'ed or shm_malloc'ed, + * depending on the presence of the BUILD_IN_SHM flag, needs freeing when * done) and sets returned_len or 0 on error. */ char * build_req_buf_from_sip_req( struct sip_msg* msg, @@ -1532,10 +1542,13 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, char* rport_buf; char* new_buf; char* buf; + str path_buf; unsigned int offset, s_offset, size; struct lump* via_anchor; struct lump* via_lump; struct lump* via_insert_param; + struct lump* path_anchor; + struct lump* path_lump; str branch; unsigned int flags; unsigned int udp_mtu; @@ -1552,6 +1565,8 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, rport_buf=0; line_buf=0; via_len=0; + path_buf.s=0; + path_buf.len=0; flags=msg->msg_flags|global_req_flags; /* Calculate message body difference and adjust Content-Length */ @@ -1653,6 +1668,42 @@ after_local_via: } after_update_via1: + /* add route with path content */ + if(unlikely(!(mode&BUILD_NO_PATH) && msg->path_vec.s && + msg->path_vec.len)){ + path_buf.len=ROUTE_PREFIX_LEN+msg->path_vec.len+CRLF_LEN; + path_buf.s=pkg_malloc(path_buf.len+1); + if (unlikely(path_buf.s==0)){ + LOG(L_ERR, "out of memory\n"); + ser_error=E_OUT_OF_MEM; + goto error00; + } + memcpy(path_buf.s, ROUTE_PREFIX, ROUTE_PREFIX_LEN); + memcpy(path_buf.s+ROUTE_PREFIX_LEN, msg->path_vec.s, + msg->path_vec.len); + memcpy(path_buf.s+ROUTE_PREFIX_LEN+msg->path_vec.len, CRLF, CRLF_LEN); + path_buf.s[path_buf.len]=0; + /* insert Route header either before the other routes + (if present & parsed) or after the local via */ + if (msg->route){ + path_anchor=anchor_lump(msg, msg->route->name.s-buf, 0, + HDR_ROUTE_T); + }else if (likely(msg->via1)){ + path_anchor=anchor_lump(msg, msg->via1->hdr.s-buf, 0, + HDR_ROUTE_T); + }else{ + /* if no via1 (theoretically possible for non-sip messages, + e.g. http xmlrpc) */ + path_anchor=anchor_lump(msg, msg->headers->name.s-buf, 0, + HDR_ROUTE_T); + } + if (unlikely(path_anchor==0)) + goto error05; + if (unlikely((path_lump=insert_new_lump_after(path_anchor, path_buf.s, + path_buf.len, + HDR_ROUTE_T))==0)) + goto error05; + } /* compute new msg len and fix overlapping zones*/ new_len=len+body_delta+lumps_len(msg, msg->add_rm, send_info)+via_len; #ifdef XL_DEBUG @@ -1767,6 +1818,8 @@ error03: if (rport_buf) pkg_free(rport_buf); error04: if (line_buf) pkg_free(line_buf); +error05: + if (path_buf.s) pkg_free(path_buf.s); error00: *returned_len=0; return 0; diff --git a/msg_translator.h b/msg_translator.h index 95758df..d381f18 100644 --- a/msg_translator.h +++ b/msg_translator.h @@ -50,7 +50,8 @@ #define BUILD_NO_LOCAL_VIA (1<<0) #define BUILD_NO_VIA1_UPDATE (1<<1) -#define BUILD_IN_SHM (1<<2) +#define BUILD_NO_PATH (1<<2) +#define BUILD_IN_SHM (1<<7) #include "parser/msg_parser.h" #include "ip_addr.h"

15 years, 4 months

git:andrei/path: permissions(s): updated to the new next_branch()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: 8a9b30a1ddef464ac1f0f5759528f79e65597e14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a9b30a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 4 15:23:17 2009 +0200 permissions(s): updated to the new next_branch() --- modules_s/permissions/allow_files.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/permissions/allow_files.c b/modules_s/permissions/allow_files.c index 514a6d0..193d4fc 100644 --- a/modules_s/permissions/allow_files.c +++ b/modules_s/permissions/allow_files.c @@ -351,7 +351,7 @@ int check_routing(struct sip_msg* msg, int idx) check_branches: init_branch_iterator(); - while((branch.s = next_branch(&branch.len, &q, 0, 0, 0))) { + while((branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0))) { uri_str = get_plain_uri(&branch); if (!uri_str) { LOG(L_ERR, "check_uri(): Error while extracting plain URI\n");

15 years, 4 months

git:andrei/path: tm: updated to the new append_branch() & next_branch()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: c667a8c4af42fb4291d37809e721cc3bd811027c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c667a8c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 4 15:19:27 2009 +0200 tm: updated to the new append_branch() & next_branch() --- modules/tm/t_fwd.c | 6 +++--- modules/tm/t_serial.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index bb0cf61..eb332d3 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1013,7 +1013,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , int success_branch; int try_new; int lock_replies; - str dst_uri; + str dst_uri, path; struct socket_info* si, *backup_si; flag_t backup_bflags = 0; flag_t bflags = 0; @@ -1083,10 +1083,10 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , } else try_new=0; init_branch_iterator(); - while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri.s, &dst_uri.len, &si))) { + while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path, + &bflags, &si))) { try_new++; p_msg->force_send_socket = si; - getbflagsval(get_branch_iterator(), &bflags); setbflagsval(0, bflags); branch_ret=add_uac( t, p_msg, &current_uri, diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index e372d04..9fa0dcf 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -448,7 +448,7 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) return -1; } - if (km_append_branch(msg, &uri, &dst, &path, 0, flags, sock) != 1) { + if (append_branch(msg, &uri, &dst, &path, 0, flags, sock) != 1) { LM_ERR("appending branch failed\n"); destroy_avp(avp); return -1; @@ -488,8 +488,8 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) destroy_avp(avp); return -1; } - - if (km_append_branch(msg, &uri, &dst, &path, 0, flags, sock) != 1) { + + if (append_branch(msg, &uri, &dst, &path, 0, flags, sock) != 1) { LM_ERR("appending branch failed\n"); destroy_avp(avp); return -1;

15 years, 4 months

git:andrei/path: cpl-c(s): updated to the new append_branch()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: dda1de2cad624c351b252f02829314f0130c8f0f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dda1de2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 4 15:21:26 2009 +0200 cpl-c(s): updated to the new append_branch() --- modules_s/cpl-c/cpl_sig.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_s/cpl-c/cpl_sig.c b/modules_s/cpl-c/cpl_sig.c index d0623d6..00b0a32 100644 --- a/modules_s/cpl-c/cpl_sig.c +++ b/modules_s/cpl-c/cpl_sig.c @@ -83,7 +83,8 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs, while(*locs) { DBG("DEBUG:cpl_c:cpl_proxy_to_loc_set: appending branch " "<%.*s>\n",(*locs)->addr.uri.len,(*locs)->addr.uri.s); - if(append_branch(msg,(*locs)->addr.uri.s,(*locs)->addr.uri.len,0, 0, Q_UNSPECIFIED, 0)==-1){ + if(append_branch(msg, &(*locs)->addr.uri, + 0, 0, Q_UNSPECIFIED, 0, 0)==-1){ LOG(L_ERR,"ERROR:cpl_c:cpl_proxy_to_loc_set: failed when " "appending branch <%s>\n",(*locs)->addr.uri.s); goto error;

15 years, 4 months

git:andrei/path: xlog(s): updated to the new next_branch()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: 858f5afd22ee01a4b476f47474314ee4735467c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=858f5af… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 4 15:24:16 2009 +0200 xlog(s): updated to the new next_branch() --- modules_s/xlog/xl_lib.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_s/xlog/xl_lib.c b/modules_s/xlog/xl_lib.c index eac0480..1242184 100644 --- a/modules_s/xlog/xl_lib.c +++ b/modules_s/xlog/xl_lib.c @@ -699,7 +699,7 @@ static int xl_get_branch(struct sip_msg *msg, str *res, str *hp, int hi, int hf) init_branch_iterator(); - branch.s = next_branch(&branch.len, &q, 0, 0, 0); + branch.s = next_branch(&branch.len, &q, 0, 0, 0, 0); if (!branch.s) { return xl_get_null(msg, res, hp, hi, hf); } @@ -730,7 +730,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int hi, int h cnt = len = 0; init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0))) + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0))) { cnt++; len += uri.len; @@ -755,7 +755,7 @@ static int xl_get_branches(struct sip_msg *msg, str *res, str *hp, int hi, int h p = local_buf; init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0))) + while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0))) { if (i) {

15 years, 4 months

git:andrei/path: osp(s): updated to the new append_branch()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: bf527133f33fdeb09dfbd4525fedf33a32a821cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf52713… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 4 15:22:38 2009 +0200 osp(s): updated to the new append_branch() --- modules_s/osp/orig_transaction.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_s/osp/orig_transaction.c b/modules_s/osp/orig_transaction.c index 3904799..905b770 100644 --- a/modules_s/osp/orig_transaction.c +++ b/modules_s/osp/orig_transaction.c @@ -452,7 +452,8 @@ static int ospPrepareDestination( if (isfirst == OSP_FIRST_ROUTE) { rewrite_uri(msg, &newuri); } else { - append_branch(msg, newuri.s, newuri.len, NULL, 0, Q_UNSPECIFIED, NULL); + append_branch(msg, &newuri, NULL, NULL, Q_UNSPECIFIED, + 0, NULL); } result = MODULE_RETURNCODE_TRUE;

15 years, 4 months

git:andrei/path: tm: path support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: 7d242ad8e9070724e7e4b0eedf1576d53b1b2aa7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d242ad… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 8 19:20:00 2009 +0200 tm: path support Path support compatible with kamailio. --- modules/tm/h_table.c | 3 + modules/tm/h_table.h | 3 +- modules/tm/sip_msg.c | 3 + modules/tm/t_fwd.c | 102 +++++++++++++++++++++++++++++++++++++------------ modules/tm/t_fwd.h | 4 +- 5 files changed, 87 insertions(+), 28 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7d2…

15 years, 4 months

git:andrei/path: exec(s): use ser_append_branch() instead of append_branch( )

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: 71cd365421f6ee1ac302e2c1d3473f71bb74dd30 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71cd365… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 4 15:22:07 2009 +0200 exec(s): use ser_append_branch() instead of append_branch() --- modules_s/exec/exec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_s/exec/exec.c b/modules_s/exec/exec.c index 73ed123..1f60aab 100644 --- a/modules_s/exec/exec.c +++ b/modules_s/exec/exec.c @@ -171,7 +171,8 @@ int exec_str(struct sip_msg *msg, str* cmd, char *param, int param_len) { goto error02; } } else { - if (append_branch(msg, uri_line, uri_len, 0, 0, Q_UNSPECIFIED, 0)==-1) { + if (ser_append_branch(msg, uri_line, uri_len, 0, 0, + Q_UNSPECIFIED, 0)==-1) { LOG(L_ERR, "ERROR: exec_str: append_branch failed;" " too many or too long URIs?\n"); goto error02;

15 years, 4 months

git:andrei/path: core: append_branch & next_branch api changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: c43dc0cd35eff000a2eb7e40c65d85367c58e412 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c43dc0c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 4 15:09:08 2009 +0200 core: append_branch & next_branch api changes - added path, branch flags support and switched the parameters to str for append_branch and next_branch. append_branch is now exactly the same as km_append_branch. - added ser_append_branch for compatibility with ser modules which don't need the extra parameters. - updated core code to use the modified api. --- action.c | 2 +- dset.c | 152 ++++++++++++++++----------------------------------------- dset.h | 46 +++++++++++++---- select_core.c | 6 +- 4 files changed, 83 insertions(+), 123 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c43…

15 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev