sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:pd/outbound: modules/exec: updated to include new argument to append_branch()
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 4ed5c06088fc87a32ecb59a291f83e947aee7070 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ed5c06… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:58:04 2013 +0000 modules/exec: updated to include new argument to append_branch() --- modules/exec/exec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/exec/exec.c b/modules/exec/exec.c index a97f471..ab8d1e6 100644 --- a/modules/exec/exec.c +++ b/modules/exec/exec.c @@ -168,7 +168,7 @@ int exec_str(struct sip_msg *msg, char *cmd, char *param, int param_len) { } } else { if (append_branch(msg, &uri, 0, 0, Q_UNSPECIFIED, 0, 0, - 0, 0) == -1) { + 0, 0, 0) == -1) { LM_ERR("append_branch failed; too many or too long URIs?\n"); goto error02; }

1 0

git:pd/outbound: core: updated to include new argument for append_branch()
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 4fb8d035a952e1f719e60470e7bea2e3877331d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fb8d03… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:46:51 2013 +0000 core: updated to include new argument for append_branch() --- action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index e64cf81..e2d9550 100644 --- a/action.c +++ b/action.c @@ -509,7 +509,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=append_branch(msg, &a->val[0].u.str, &msg->dst_uri, &msg->path_vec, a->val[1].u.number, (flag_t)flags, msg->force_send_socket, - 0, 0); + 0, 0, 0); /* if the uri is the ruri and q was also not changed, mark ruri as consumed, to avoid having an identical branch */ if ((a->val[0].u.str.s == 0 || a->val[0].u.str.len == 0) &&

1 0

git:pd/outbound: modules/avpops: updated to include new argument to append_branch()
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: bc8fd8b3b458bf088a83e6c6f17bd21743aaf8e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc8fd8b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:56:27 2013 +0000 modules/avpops: updated to include new argument to append_branch() --- modules/avpops/avpops_impl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index fda6db1..890fc14 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -999,7 +999,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst, /* if is not the first modification, push the current uri as * branch */ if (append_branch( msg, 0, 0, 0, Q_UNSPECIFIED, - 0, 0, 0, 0) != 1) + 0, 0, 0, 0, 0) != 1) { LM_ERR("append_branch action failed\n"); goto error; @@ -1026,7 +1026,7 @@ int ops_pushto_avp (struct sip_msg* msg, struct fis_param* dst, ruri_mark_new(); /* re-use uri for serial forking */ } else if (dst->opd&AVPOPS_USE_BRANCH) { if (append_branch( msg, &val, 0, 0, Q_UNSPECIFIED, 0, - msg->force_send_socket, 0, 0) != 1) + msg->force_send_socket, 0, 0, 0) != 1) { LM_ERR("append_branch action failed\n"); goto error;

1 0

git:pd/outbound: modules/dialplan: updated to include new argument to append_branch()
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: dab406ed0301bfea5a9e6234119082e445dd5806 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dab406e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:57:30 2013 +0000 modules/dialplan: updated to include new argument to append_branch() --- modules/dialplan/dialplan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index ffa8bb4..d416d2f 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -295,7 +295,7 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t * dest, if(is_route_type(FAILURE_ROUTE) && (dest->type==PVT_RURI || dest->type==PVT_RURI_USERNAME)) { - if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0) != 1) { + if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0) != 1) { LM_ERR("append_branch action failed\n"); return -1; }

1 0

git:pd/outbound: modules/corex: updated to include new argument to append_branch()
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 4d3639a674af7ae8102e3ae3e94e84674d9848ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d3639a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:56:51 2013 +0000 modules/corex: updated to include new argument to append_branch() --- modules/corex/corex_lib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/corex/corex_lib.c b/modules/corex/corex_lib.c index 7f2ea2a..bd81f3b 100644 --- a/modules/corex/corex_lib.c +++ b/modules/corex/corex_lib.c @@ -71,7 +71,7 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq) getbflagsval(0, &branch_flags); ret = append_branch(msg, (uri.len>0)?&uri:0, &msg->dst_uri, &msg->path_vec, q, branch_flags, - msg->force_send_socket, 0, 0); + msg->force_send_socket, 0, 0, 0); if(uri.len<=0)

1 0

git:pd/outbound: modules/alias_db: updated to include new argument to append_branch()
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 821d92298d22c6fa2d17e85b3c0f021cd0dbeb8e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=821d922… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:55:46 2013 +0000 modules/alias_db: updated to include new argument to append_branch() --- modules/alias_db/alookup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/alias_db/alookup.c b/modules/alias_db/alookup.c index 9aff3d8..aa25212 100644 --- a/modules/alias_db/alookup.c +++ b/modules/alias_db/alookup.c @@ -202,7 +202,7 @@ int alias_db_lookup(struct sip_msg* _msg, str table_s) } else { user_s.s = useruri_buf; if (append_branch(_msg, &user_s, 0, 0, MIN_Q, 0, 0, - 0, 0) == -1) + 0, 0, 0) == -1) { LM_ERR("error while appending branches\n"); goto err_server;

1 0

git:pd/outbound: modules/registrar: fill in ruid in msg and branch structures during lookup()
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: ac7b94dbd991ba5c25d9afece2b6172b829f514b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac7b94d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:46:08 2013 +0000 modules/registrar: fill in ruid in msg and branch structures during lookup() --- modules/registrar/lookup.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c index 91ccb8e..8872577 100644 --- a/modules/registrar/lookup.c +++ b/modules/registrar/lookup.c @@ -273,6 +273,13 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) _m->reg_id = ptr->reg_id; + if (ptr->ruid.len) { + if (set_ruid(_m, &(ptr->ruid)) < 0) { + ret = -3; + goto done; + } + } + set_ruri_q(ptr->q); old_bflags = 0; @@ -316,7 +323,8 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) &ptr->path, ptr->q, ptr->cflags, ptr->sock, ptr->instance.len?&(ptr->instance):0, - ptr->instance.len?ptr->reg_id:0) + ptr->instance.len?ptr->reg_id:0, + &ptr->ruid) == -1) { LM_ERR("failed to append a branch\n"); /* Also give a chance to the next branches*/ @@ -351,6 +359,7 @@ int reset_ruri_branch(sip_msg_t *msg) setbflagsval(0, 0); reset_instance(msg); msg->reg_id = 0; + reset_ruid(msg); return 0; } @@ -375,6 +384,7 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) flag_t ruri_b_flags = 0; str ruri_b_instance = {0}; unsigned int ruri_b_reg_id = 0; + str ruri_b_ruid = {0}; branch_t *crt = NULL; ret = 1; @@ -399,6 +409,7 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) getbflagsval(0, &ruri_b_flags); ruri_b_instance = msg->instance; ruri_b_reg_id = msg->reg_id; + ruri_b_ruid = msg->ruid; reset_ruri_branch(msg); for(i=0; i<nr_branches_start; i++) { @@ -478,6 +489,7 @@ done: setbflagsval(0, ruri_b_flags); msg->instance = ruri_b_instance; msg->reg_id = ruri_b_reg_id; + msg->ruid = ruri_b_ruid; return (found)?1:ret; }

1 0

git:pd/outbound: core: added ruid to msg and branch structures
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: e3ba8f38f7bd008f72705fb6acd082e65b5a140e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3ba8f3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:42:16 2013 +0000 core: added ruid to msg and branch structures --- config.h | 2 ++ dset.c | 19 ++++++++++++++++++- dset.h | 11 ++++++++--- parser/msg_parser.c | 39 +++++++++++++++++++++++++++++++++++++++ parser/msg_parser.h | 5 +++++ 5 files changed, 72 insertions(+), 4 deletions(-) diff --git a/config.h b/config.h index 2368503..85e6388 100644 --- a/config.h +++ b/config.h @@ -75,6 +75,8 @@ #define MAX_INSTANCE_SIZE 256 /*!< Maximum length of +sip.instance contact header param value buffer */ +#define MAX_RUID_SIZE 65 /*!< Maximum length of ruid for location records */ + #define MY_VIA "Via: SIP/2.0/UDP " #define MY_VIA_LEN (sizeof(MY_VIA) - 1) diff --git a/dset.c b/dset.c index 536a7ae..d0aef89 100644 --- a/dset.c +++ b/dset.c @@ -297,7 +297,8 @@ void clear_branches(void) int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, qvalue_t q, unsigned int flags, struct socket_info* force_socket, - str* instance, unsigned int reg_id) + str* instance, unsigned int reg_id, + str* ruid) { str luri; @@ -381,6 +382,22 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, /* copy reg_id */ branches[nr_branches].reg_id = reg_id; + /* copy ruid string */ + if (unlikely(ruid && ruid->len && ruid->s)) { + if (unlikely(ruid->len > MAX_RUID_SIZE - 1)) { + LOG(L_ERR, "too long ruid: %.*s\n", + ruid->len, ruid->s); + return -1; + } + memcpy(branches[nr_branches].ruid, ruid->s, + ruid->len); + branches[nr_branches].ruid[ruid->len] = 0; + branches[nr_branches].ruid_len = ruid->len; + } else { + branches[nr_branches].ruid[0] = '\0'; + branches[nr_branches].ruid_len = 0; + } + nr_branches++; return 1; } diff --git a/dset.h b/dset.h index bc131ef..3140f95 100644 --- a/dset.h +++ b/dset.h @@ -66,6 +66,10 @@ struct branch /* reg-id contact header param value */ unsigned int reg_id; + /* ruid value from usrloc */ + char ruid[MAX_RUID_SIZE]; + unsigned int ruid_len; + /* Branch flags */ flag_t flags; }; @@ -88,11 +92,12 @@ int drop_sip_branch(int idx); int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, qvalue_t q, unsigned int flags, struct socket_info* force_socket, - str* instance, unsigned int reg_id); + str* instance, unsigned int reg_id, + str* ruid); /*! \brief kamailio compatible version */ #define km_append_branch(msg, uri, dst_uri, path, q, flags, force_socket) \ - append_branch(msg, uri, dst_uri, path, q, flags, force_socket, 0, 0) + append_branch(msg, uri, dst_uri, path, q, flags, force_socket, 0, 0, 0) /*! \brief ser compatible append_branch version. * append_branch version compatible with ser: no path or branch flags support @@ -109,7 +114,7 @@ static inline int ser_append_branch(struct sip_msg* msg, s_uri.len=uri_len; s_dst_uri.s=dst_uri; s_dst_uri.len=dst_uri_len; - return append_branch(msg, &s_uri, &s_dst_uri, 0, q, 0, force_socket, 0, 0); + return append_branch(msg, &s_uri, &s_dst_uri, 0, q, 0, force_socket, 0, 0, 0); } diff --git a/parser/msg_parser.c b/parser/msg_parser.c index dfed08d..9e5bd34 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -859,6 +859,45 @@ void reset_instance(struct sip_msg* const msg) } +int set_ruid(struct sip_msg* msg, str* ruid) +{ + char* ptr; + + if (unlikely(!msg || !ruid)) { + LM_ERR("invalid ruid parameter value\n"); + return -1; + } + + if (unlikely(ruid->len == 0)) { + reset_ruid(msg); + } else if (msg->ruid.s && (msg->ruid.len >= ruid->len)) { + memcpy(msg->ruid.s, ruid->s, ruid->len); + msg->ruid.len = ruid->len; + } else { + ptr = (char*)pkg_malloc(ruid->len); + if (!ptr) { + LM_ERR("not enough pkg memory for ruid\n"); + return -1; + } + memcpy(ptr, ruid->s, ruid->len); + if (msg->ruid.s) pkg_free(msg->ruid.s); + msg->ruid.s = ptr; + msg->ruid.len = ruid->len; + } + return 0; +} + + +void reset_ruid(struct sip_msg* const msg) +{ + if(msg->ruid.s != 0) { + pkg_free(msg->ruid.s); + } + msg->ruid.s = 0; + msg->ruid.len = 0; +} + + hdr_field_t* get_hdr(const sip_msg_t* const msg, const enum _hdr_types_t ht) { hdr_field_t *hdr; diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 79194e3..09a8460 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -365,6 +365,7 @@ typedef struct sip_msg { str path_vec; str instance; unsigned int reg_id; + str ruid; } sip_msg_t; /*! \brief pointer to a fakes message which was never received ; @@ -453,6 +454,10 @@ int set_instance(struct sip_msg* msg, str* instance); void reset_instance(struct sip_msg* const msg); +int set_ruid(struct sip_msg* msg, str* ruid); + +void reset_ruid(struct sip_msg* const msg); + /** force a specific send socket for forwarding a request. * @param msg - sip msg. * @param fsocket - forced socket, pointer to struct socket_info, can be 0 (in

1 0

git:pd/outbound: modules/registrar: fixed typo
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 0e634d5828ec7e2c9418089007cdac0318e4aced URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e634d5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:00:54 2013 +0000 modules/registrar: fixed typo --- modules/registrar/save.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 8737df0..bfcbaf6 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -990,7 +990,7 @@ int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid) ul.lock_udomain(_d, &aor); if (ul.get_urecord_by_ruid(_d, ul.get_aorhash(&aor), - _ruid, r, c) != 0) { + _ruid, &r, &c) != 0) { ul.unlock_udomain(_d, &aor); LM_WARN("AOR/Contact not found\n"); return -1;

1 0

git:pd/outbound: parser: fixed typo
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: f892c3c87b181c4b3d32b080f2dbb8ba0b88807f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f892c3c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:57:59 2013 +0000 parser: fixed typo --- parser/parse_require.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/parse_require.h b/parser/parse_require.h index 0e623dd..3ffaf10 100644 --- a/parser/parse_require.h +++ b/parser/parse_require.h @@ -31,7 +31,7 @@ #define PARSE_REQUIRE_H #include "msg_parser.h" -#include "parser/hf.h" +#include "hf.h" #include "../mem/mem.h" #include "parse_option_tags.h"

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013