sr-dev February 2019

sr-dev@lists.kamailio.org

23 participants
336 discussions

[kamailio/kamailio] Rich redirects (#1243)
by Alex Hermann 11 Feb '19

11 Feb '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  If Kamailio sends a 301/302, the current dset is added as Contact header automatically. The feature in this PR will optionally extend this Contact header with more information. - The path vector for each contact can be added as a Contact-uri Route header (rfc 3327 conformant). - The branch flags can be added as a Contact-header parameter (non-standard). In addition, the get_redirects function is extended to optionally parse the new flags parameter. The Route header can be extracted from the r-uri in the script. The new functionality must be enabled with module parameters, by default the behavior is unchanged. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1243 -- Commit Summary -- * core: Cleanup printing the dset * core: dset: Create Contacts header with path vector as Route header * core: dset: Create contacts with flags as header parameter * core modules/tm modules/sl: Make adding path and flags to redirected contacts optional * core: Increase MAX_REDIRECTION_LEN from 512 to 4096 * uac_redirect: Parse Contact's "flags" header parameter into branch flags. -- File Changes -- M src/core/config.h (2) M src/core/dset.c (252) M src/core/dset.h (6) M src/core/parser/contact/contact.c (2) M src/core/parser/contact/contact.h (1) M src/core/parser/parse_param.c (11) M src/core/parser/parse_param.h (2) M src/modules/pv/pv_core.c (2) M src/modules/sl/doc/sl_params.xml (30) M src/modules/sl/sl.c (1) M src/modules/sl/sl_funcs.c (5) M src/modules/sl/sl_funcs.h (2) M src/modules/tm/doc/params.xml (30) M src/modules/tm/t_reply.c (4) M src/modules/tm/tm.c (1) M src/modules/uac_redirect/doc/uac_redirect_admin.xml (40) M src/modules/uac_redirect/rd_funcs.c (11) M src/modules/uac_redirect/rd_funcs.h (2) M src/modules/uac_redirect/uac_redirect.c (2) M src/modules/xprint/xp_lib.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1243.patch https://github.com/kamailio/kamailio/pull/1243.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1243

3 15

git:master:393a86f3: core/config: Increase MAX_REDIRECTION_LEN from 512 to 4096
by Henning Westerholt 11 Feb '19

11 Feb '19

Module: kamailio Branch: master Commit: 393a86f32ab4fc61f53dd181935cca73c6335faa URL: https://github.com/kamailio/kamailio/commit/393a86f32ab4fc61f53dd181935cca7… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-11T21:42:26+01:00 core/config: Increase MAX_REDIRECTION_LEN from 512 to 4096 Contacts can be long and there may be many of them. --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/393a86f32ab4fc61f53dd181935cca7… Patch: https://github.com/kamailio/kamailio/commit/393a86f32ab4fc61f53dd181935cca7… --- diff --git a/src/core/config.h b/src/core/config.h index bdc7657365..a891328eb3 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -166,7 +166,7 @@ #define MAX_PRINT_TEXT 256 /*!< max length of the text of fifo 'print' command */ -#define MAX_REDIRECTION_LEN 512 /*!< maximum length of Contact header field in redirection replies */ +#define MAX_REDIRECTION_LEN 4096 /*!< maximum length of Contact header field in redirection replies */ /*! \brief used by FIFO statistics in module to terminate line; extra whitespaces are used to overwrite remainders of

1 0

git:master:27e1e63a: uac_redirect: Use Contact's "flags" header parameter into branch flags.
by Henning Westerholt 11 Feb '19

11 Feb '19

Module: kamailio Branch: master Commit: 27e1e63a9b31f3d85b0cdcd916e9ab85f9264fde URL: https://github.com/kamailio/kamailio/commit/27e1e63a9b31f3d85b0cdcd916e9ab8… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-11T21:42:26+01:00 uac_redirect: Use Contact's "flags" header parameter into branch flags. --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml Modified: src/modules/uac_redirect/rd_funcs.c Modified: src/modules/uac_redirect/rd_funcs.h Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/27e1e63a9b31f3d85b0cdcd916e9ab8… Patch: https://github.com/kamailio/kamailio/commit/27e1e63a9b31f3d85b0cdcd916e9ab8… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index 2c7fc0e883..b044d38c25 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -302,8 +302,46 @@ branch_route[1] { </programlisting> </example> </section> + <section> + <title><varname>flags_hdr_mode</varname> (int)</title> + <para> + Specifies if and how a Contact's flags header parameter + must be used. If set, and a flags header parameter is set, + its value will be set as branch flags for that contact. + </para> + <para> + Its values may be: + </para> + <itemizedlist> + <listitem> + <para><emphasis>0</emphasis> - ignore flags header parameter, + just use bflags module parameter</para> + </listitem> + <listitem> + <para><emphasis>1</emphasis> - use flags header parameter if + present, ignore bflags module parameter</para> + </listitem> + <listitem> + <para><emphasis>2</emphasis> - use flags header parameter if + present and merge (binary or) it with the bflags module + parameter</para> + </listitem> + </itemizedlist> + <para> + <emphasis> + The default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>flags_hdr_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("uac_redirect","flags_hdr_mode",2) +... + </programlisting> + </example> + </section> </section> - <section> <title>Functions</title> <section id="uac_redirect.f.set_deny_filter"> diff --git a/src/modules/uac_redirect/rd_funcs.c b/src/modules/uac_redirect/rd_funcs.c index fdd885b179..3dcf8077b6 100644 --- a/src/modules/uac_redirect/rd_funcs.c +++ b/src/modules/uac_redirect/rd_funcs.c @@ -199,6 +199,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, int added; int dup; int ret; + unsigned int flags; /* dup can be: * 0 - sh reply but nothing duplicated @@ -294,8 +295,14 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, LM_DBG("adding contact <%.*s>\n", scontacts[i]->uri.len, scontacts[i]->uri.s); if(sruid_next(&_redirect_sruid)==0) { + if (flags_hdr_mode && scontacts[i]->flags && str2int(&(scontacts[i]->flags->body), &flags) == 0) { + if (flags_hdr_mode == 2) + flags |= bflags; + } else { + flags = bflags; + } if(append_branch( 0, &scontacts[i]->uri, 0, 0, sqvalues[i], - bflags, 0, &_redirect_sruid.uid, 0, + flags, 0, &_redirect_sruid.uid, 0, &_redirect_sruid.uid, &_redirect_sruid.uid)<0) { LM_ERR("failed to add contact to dset\n"); } else { diff --git a/src/modules/uac_redirect/rd_funcs.h b/src/modules/uac_redirect/rd_funcs.h index a5304c19dc..f686615969 100644 --- a/src/modules/uac_redirect/rd_funcs.h +++ b/src/modules/uac_redirect/rd_funcs.h @@ -36,6 +36,8 @@ extern cmd_function rd_acc_fct; extern char *acc_db_table; +extern int flags_hdr_mode; + int get_redirect( struct sip_msg *msg , int maxt, int maxb, struct acc_param *reason, unsigned int bflags); diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index e1f7d640db..6ade1719c6 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -48,6 +48,7 @@ char *accept_filter_s = 0; char *def_filter_s = 0; unsigned int bflags = 0; +int flags_hdr_mode = 0; #define ACCEPT_RULE_STR "accept" #define DENY_RULE_STR "deny" @@ -86,6 +87,7 @@ static param_export_t params[] = { {"acc_function", PARAM_STRING, &acc_fct_s }, {"acc_db_table", PARAM_STRING, &acc_db_table }, {"bflags", INT_PARAM, &bflags }, + {"flags_hdr_mode", INT_PARAM, &flags_hdr_mode }, {0, 0, 0} };

1 0

git:master:5af1a114: core/parser: Add parser for 'flags' param in Contact header
by Henning Westerholt 11 Feb '19

11 Feb '19

Module: kamailio Branch: master Commit: 5af1a114d879f36fbe1982c32e27b497926487c0 URL: https://github.com/kamailio/kamailio/commit/5af1a114d879f36fbe1982c32e27b49… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-11T21:42:26+01:00 core/parser: Add parser for 'flags' param in Contact header --- Modified: src/core/parser/contact/contact.c Modified: src/core/parser/contact/contact.h Modified: src/core/parser/parse_param.c Modified: src/core/parser/parse_param.h --- Diff: https://github.com/kamailio/kamailio/commit/5af1a114d879f36fbe1982c32e27b49… Patch: https://github.com/kamailio/kamailio/commit/5af1a114d879f36fbe1982c32e27b49… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 06b85dd5dd..61a40e3bd8 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -244,6 +244,7 @@ int parse_contacts(str* _s, contact_t** _c) c->methods = hooks.contact.methods; c->instance = hooks.contact.instance; c->reg_id = hooks.contact.reg_id; + c->flags = hooks.contact.flags; if (_s->len == 0) goto ok; } @@ -314,6 +315,7 @@ void print_contacts(FILE* _o, contact_t* _c) fprintf(_o, "methods : %p\n", ptr->methods); fprintf(_o, "instance: %p\n", ptr->instance); fprintf(_o, "reg-id : %p\n", ptr->reg_id); + fprintf(_o, "flags : %p\n", ptr->flags); fprintf(_o, "len : %d\n", ptr->len); if (ptr->params) { print_params(_o, ptr->params); diff --git a/src/core/parser/contact/contact.h b/src/core/parser/contact/contact.h index c2d63aef71..b72f9e59d9 100644 --- a/src/core/parser/contact/contact.h +++ b/src/core/parser/contact/contact.h @@ -50,6 +50,7 @@ typedef struct contact { param_t* received; /* received parameter hook */ param_t* instance; /* sip.instance parameter hook */ param_t* reg_id; /* reg-id parameter hook */ + param_t* flags; /* flags parameter hook */ param_t* params; /* List of all parameters */ int len; /* Total length of the element */ struct contact* next; /* Next contact in the list */ diff --git a/src/core/parser/parse_param.c b/src/core/parser/parse_param.c index 5af3993cb9..b80ffbdcc0 100644 --- a/src/core/parser/parse_param.c +++ b/src/core/parser/parse_param.c @@ -173,6 +173,14 @@ static inline void parse_contact_class(param_hooks_t *_h, param_t *_p) _h->contact.ob = _p; } break; + case 'f': + case 'F': + if ((_p->name.len == 5) && + (!strncasecmp(_p->name.s + 1, "lags", 4))) { + _p->type = P_FLAGS; + _h->contact.flags = _p; + } + break; } } @@ -673,6 +681,9 @@ static inline void print_param(FILE *_o, param_t *_p) case P_METHODS: type = "P_METHODS"; break; + case P_FLAGS: + type = "P_FLAGS"; + break; case P_TRANSPORT: type = "P_TRANSPORT"; break; diff --git a/src/core/parser/parse_param.h b/src/core/parser/parse_param.h index 1007358125..ebb3ac56d6 100644 --- a/src/core/parser/parse_param.h +++ b/src/core/parser/parse_param.h @@ -44,6 +44,7 @@ typedef enum ptype { P_EXPIRES, /*!< Contact: expires parameter */ P_METHODS, /*!< Contact: methods parameter */ P_RECEIVED, /*!< Contact: received parameter */ + P_FLAGS, /*!< Contact: flags parameter */ P_TRANSPORT, /*!< URI: transport parameter */ P_LR, /*!< URI: lr parameter */ P_R2, /*!< URI: r2 parameter (ser specific) */ @@ -98,6 +99,7 @@ struct contact_hooks { struct param* instance; /*!< sip.instance parameter */ struct param* reg_id; /*!< reg-id parameter */ struct param* ob; /*!< ob parameter */ + struct param* flags; /*!< flags parameter */ };

1 0

git:master:62c7a4b3: tm: Add option to add path and flags to redirected contacts
by Henning Westerholt 11 Feb '19

11 Feb '19

Module: kamailio Branch: master Commit: 62c7a4b35d335374d231324f42843afef8e0d6a5 URL: https://github.com/kamailio/kamailio/commit/62c7a4b35d335374d231324f42843af… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-11T21:42:26+01:00 tm: Add option to add path and flags to redirected contacts --- Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/62c7a4b35d335374d231324f42843af… Patch: https://github.com/kamailio/kamailio/commit/62c7a4b35d335374d231324f42843af… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 3692dab0d4..75b60d9b0a 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1485,4 +1485,34 @@ modparam("tm", "relay_100", 1) </example> </section> + <section id="tm.p.rich_redirect"> + <title><varname>rich_redirect</varname> (int)</title> + <para> + When sending a 3xx class reply, include additional branch info + to the contacts such as path vector and branch flags. + </para> + <itemizedlist> + <listitem><para> + <emphasis>0</emphasis> - no extra info is added (default) + </para></listitem> + <listitem><para> + <emphasis>1</emphasis> - include branch flags as contact header parameter + </para></listitem> + <listitem><para> + <emphasis>2</emphasis> - include path as contact uri Route header + </para></listitem> + </itemizedlist> + <para> + Values may be combined (added). + </para> + <example> + <title>rich_redirect example</title> + <programlisting> +... +modparam("tm", "rich_redirect", 3) +.... + </programlisting> + </example> + </section> + </section> diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index e2058cae78..e1e8051cf1 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -102,6 +102,8 @@ int goto_on_sl_reply=0; /* remap 503 response code to 500 */ extern int tm_remap_503_500; +/* send path and flags in 3xx class reply */ +int tm_rich_redirect = 0; /* how to deal with winning branch reply selection in failure_route * can be overwritten per transaction with t_drop_replies(...) @@ -640,7 +642,7 @@ static int _reply( struct cell *trans, struct sip_msg* p_msg, /* if that is a redirection message, dump current message set to it */ if (code>=300 && code<400) { - dset=print_dset(p_msg, &dset_len, 0); + dset=print_dset(p_msg, &dset_len, tm_rich_redirect); if (dset) { add_lump_rpl(p_msg, dset, dset_len, LUMP_RPL_HDR); } diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index c8afee9c4c..c4a277d824 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -475,6 +475,7 @@ static param_export_t params[]={ {"xavp_contact", PARAM_STR, &ulattrs_xavp_name }, {"event_callback", PARAM_STR, &tm_event_callback }, {"relay_100", PARAM_INT, &default_tm_cfg.relay_100 }, + {"rich_redirect" , PARAM_INT, &tm_rich_redirect }, {0,0,0} };

1 0

git:master:ea96ddf5: sl: Add option to add path and flags to redirected contacts
by Henning Westerholt 11 Feb '19

11 Feb '19

Module: kamailio Branch: master Commit: ea96ddf5ab1716855afe1fe4f0efe32dc1d765f4 URL: https://github.com/kamailio/kamailio/commit/ea96ddf5ab1716855afe1fe4f0efe32… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-11T21:42:26+01:00 sl: Add option to add path and flags to redirected contacts --- Modified: src/modules/sl/doc/sl_params.xml Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c Modified: src/modules/sl/sl_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/ea96ddf5ab1716855afe1fe4f0efe32… Patch: https://github.com/kamailio/kamailio/commit/ea96ddf5ab1716855afe1fe4f0efe32… --- diff --git a/src/modules/sl/doc/sl_params.xml b/src/modules/sl/doc/sl_params.xml index f6ee54ba3d..79db29ab88 100644 --- a/src/modules/sl/doc/sl_params.xml +++ b/src/modules/sl/doc/sl_params.xml @@ -61,4 +61,34 @@ modparam("sl", "bind_tm", 0) # feature disabled </example> </section> + <section id="rich_redirect"> + <title><varname>rich_redirect</varname> (int)</title> + <para> + When sending a 3xx class reply, include additional branch info + to the contacts such as path vector and branch flags. + </para> + <itemizedlist> + <listitem><para> + <emphasis>0</emphasis> - no extra info is added (default) + </para></listitem> + <listitem><para> + <emphasis>1</emphasis> - include branch flags as contact header parameter + </para></listitem> + <listitem><para> + <emphasis>2</emphasis> - include path as contact uri Route header + </para></listitem> + </itemizedlist> + <para> + Values may be combined (added). + </para> + <example> + <title>rich_redirect example</title> + <programlisting format="linespecific"> +... +modparam("sl", "rich_redirect", 3) +... + </programlisting> + </example> + </section> + </section> diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 36c8a8eec7..10361b12e1 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -116,6 +116,7 @@ static param_export_t params[] = { {"default_code", PARAM_INT, &default_code}, {"default_reason", PARAM_STR, &default_reason}, {"bind_tm", PARAM_INT, &sl_bind_tm}, + {"rich_redirect", PARAM_INT, &sl_rich_redirect}, {0, 0, 0} }; diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index c9730d7195..7cdce0cda2 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -55,6 +55,9 @@ static int _sl_filtered_ack_route = -1; /* default disabled */ static int _sl_evrt_local_response = -1; /* default disabled */ +/* send path and flags in 3xx class reply */ +int sl_rich_redirect = 0; + /*! * lookup sl event routes */ @@ -150,7 +153,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) /* if that is a redirection message, dump current message set to it */ if (code>=300 && code<400) { - dset.s=print_dset(msg, &dset.len, 0); + dset.s=print_dset(msg, &dset.len, sl_rich_redirect); if (dset.s) { add_lump_rpl(msg, dset.s, dset.len, LUMP_RPL_HDR); } diff --git a/src/modules/sl/sl_funcs.h b/src/modules/sl/sl_funcs.h index 659061f366..53711efd37 100644 --- a/src/modules/sl/sl_funcs.h +++ b/src/modules/sl/sl_funcs.h @@ -30,6 +30,8 @@ #define SL_TOTAG_SEPARATOR '.' +extern int sl_rich_redirect; + int sl_startup(); int sl_shutdown();

1 0

git:master:0679bfd4: core/dset: Create contacts with flags as header parameter
by Henning Westerholt 11 Feb '19

11 Feb '19

Module: kamailio Branch: master Commit: 0679bfd41f211850f153ae5e6a99efd82c60345e URL: https://github.com/kamailio/kamailio/commit/0679bfd41f211850f153ae5e6a99efd… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-11T21:42:26+01:00 core/dset: Create contacts with flags as header parameter Add the branch flags to the Contact uri in a redirect (302). --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/0679bfd41f211850f153ae5e6a99efd… Patch: https://github.com/kamailio/kamailio/commit/0679bfd41f211850f153ae5e6a99efd… --- diff --git a/src/core/dset.c b/src/core/dset.c index d911515e0b..1803155206 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -53,6 +53,9 @@ #define ROUTE_PARAM "?Route=" #define ROUTE_PARAM_LEN (sizeof(ROUTE_PARAM) - 1) +#define FLAGS_PARAM ";flags=" +#define FLAGS_PARAM_LEN (sizeof(FLAGS_PARAM) - 1) + /* * Where we store URIs of additional transaction branches * (sr_dst_max_branches - 1 : because of the default branch for r-uri, #0 in tm) @@ -476,7 +479,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, * end = end of target buffer * Returns 0 on success or -1 on error (buffer is too short) */ -static int print_contact_str(char **dest, str *uri, qvalue_t q, str *path, char *end, int options) +static int print_contact_str(char **dest, str *uri, qvalue_t q, str *path, unsigned int flags, char *end, int options) { char *p = *dest; str buf; @@ -521,6 +524,19 @@ static int print_contact_str(char **dest, str *uri, qvalue_t q, str *path, char memcpy(p, buf.s, buf.len); p += buf.len; } + + /* branch flags (not SIP standard conformant) */ + if (options & DS_FLAGS) { + buf.s = int2str(flags, &buf.len); + if (p + FLAGS_PARAM_LEN + buf.len > end) { + return -1; + } + memcpy(p, FLAGS_PARAM, FLAGS_PARAM_LEN); + p += FLAGS_PARAM_LEN; + memcpy(p, buf.s, buf.len); + p += buf.len; + } + *dest = p; return 0; } @@ -535,6 +551,7 @@ char* print_dset(struct sip_msg* msg, int* len, int options) int cnt = 0; qvalue_t q; str uri, path; + unsigned int flags; char *p; int crt_branch; static char dset[MAX_REDIRECTION_LEN]; @@ -552,7 +569,7 @@ char* print_dset(struct sip_msg* msg, int* len, int options) /* current uri */ if (msg->new_uri.s) { - if (print_contact_str(&p, &msg->new_uri, ruri_q, &msg->path_vec, end, options) < 0) { + if (print_contact_str(&p, &msg->new_uri, ruri_q, &msg->path_vec, ruri_bflags, end, options) < 0) { goto memfail; } cnt++; @@ -560,7 +577,7 @@ char* print_dset(struct sip_msg* msg, int* len, int options) /* branches */ init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, &path, 0, 0, 0, 0, 0))) { + while ((uri.s = next_branch(&uri.len, &q, 0, &path, &flags, 0, 0, 0, 0))) { if (cnt > 0) { if (p + CONTACT_DELIM_LEN > end) { goto memfail; @@ -569,7 +586,7 @@ char* print_dset(struct sip_msg* msg, int* len, int options) p += CONTACT_DELIM_LEN; } - if (print_contact_str(&p, &uri, q, &path, end, options) < 0) { + if (print_contact_str(&p, &uri, q, &path, flags, end, options) < 0) { goto memfail; } diff --git a/src/core/dset.h b/src/core/dset.h index e09262c834..65b54c3104 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -37,6 +37,7 @@ extern unsigned int nr_branches; extern int ruri_is_new; +#define DS_FLAGS 1 #define DS_PATH 2 /*! \brief

1 0

git:master:632f5439: core/dset: Create Contacts header with path vector as Route header
by Henning Westerholt 11 Feb '19

11 Feb '19

Module: kamailio Branch: master Commit: 632f54393fe315be3aa2291d4f229fad645a5165 URL: https://github.com/kamailio/kamailio/commit/632f54393fe315be3aa2291d4f229fa… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-11T21:42:26+01:00 core/dset: Create Contacts header with path vector as Route header When Kamailio is functioning as a registrar sends a 302 redirect, the registered contacts are sent inside the Contact header. If a contact as a path vector, that path should become a Route header in the INVITE (rfc 3327). This patch adds the path vector as a Route header parameter to the Contacts in the redirect so the receiving entity of the 302 can add the proper Route headers. This is a standard way to specify headers to be added to a request, see rfc3261 section 19.1.1. --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/632f54393fe315be3aa2291d4f229fa… Patch: https://github.com/kamailio/kamailio/commit/632f54393fe315be3aa2291d4f229fa… --- diff --git a/src/core/dset.c b/src/core/dset.c index 239a4f2ebc..d911515e0b 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -39,6 +39,7 @@ #include "dset.h" #include "mem/mem.h" #include "ip_addr.h" +#include "strutils.h" #define CONTACT "Contact: " #define CONTACT_LEN (sizeof(CONTACT) - 1) @@ -49,6 +50,8 @@ #define Q_PARAM ";q=" #define Q_PARAM_LEN (sizeof(Q_PARAM) - 1) +#define ROUTE_PARAM "?Route=" +#define ROUTE_PARAM_LEN (sizeof(ROUTE_PARAM) - 1) /* * Where we store URIs of additional transaction branches @@ -465,6 +468,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, return 1; } + /*! \brief * Combines the given elements into a Contact header field * dest = target buffer, will be updated to new position after the printed contact @@ -472,7 +476,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, * end = end of target buffer * Returns 0 on success or -1 on error (buffer is too short) */ -static int print_contact_str(char **dest, str *uri, qvalue_t q, char *end, int options) +static int print_contact_str(char **dest, str *uri, qvalue_t q, str *path, char *end, int options) { char *p = *dest; str buf; @@ -484,6 +488,25 @@ static int print_contact_str(char **dest, str *uri, qvalue_t q, char *end, int o *p++ = '<'; memcpy(p, uri->s, uri->len); p += uri->len; + + /* uri parameters */ + /* path vector as route header parameter */ + if ((options & DS_PATH) && path->len > 0) { + if (p + ROUTE_PARAM_LEN + path->len > end) { + return -1; + } + memcpy(p, ROUTE_PARAM, ROUTE_PARAM_LEN); + p += ROUTE_PARAM_LEN; + /* copy escaped path into dest */ + buf.s = p; + buf.len = end - p; + if (escape_param(path, &buf) < 0) { + return -1; + } + p += buf.len; + } + + /* end of uri parameters */ *p++ = '>'; /* header parameters */ @@ -511,7 +534,7 @@ char* print_dset(struct sip_msg* msg, int* len, int options) { int cnt = 0; qvalue_t q; - str uri; + str uri, path; char *p; int crt_branch; static char dset[MAX_REDIRECTION_LEN]; @@ -529,7 +552,7 @@ char* print_dset(struct sip_msg* msg, int* len, int options) /* current uri */ if (msg->new_uri.s) { - if (print_contact_str(&p, &msg->new_uri, ruri_q, end, options) < 0) { + if (print_contact_str(&p, &msg->new_uri, ruri_q, &msg->path_vec, end, options) < 0) { goto memfail; } cnt++; @@ -537,7 +560,7 @@ char* print_dset(struct sip_msg* msg, int* len, int options) /* branches */ init_branch_iterator(); - while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { + while ((uri.s = next_branch(&uri.len, &q, 0, &path, 0, 0, 0, 0, 0))) { if (cnt > 0) { if (p + CONTACT_DELIM_LEN > end) { goto memfail; @@ -546,7 +569,7 @@ char* print_dset(struct sip_msg* msg, int* len, int options) p += CONTACT_DELIM_LEN; } - if (print_contact_str(&p, &uri, q, end, options) < 0) { + if (print_contact_str(&p, &uri, q, &path, end, options) < 0) { goto memfail; } diff --git a/src/core/dset.h b/src/core/dset.h index b786cee053..e09262c834 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -37,6 +37,8 @@ extern unsigned int nr_branches; extern int ruri_is_new; +#define DS_PATH 2 + /*! \brief * Structure for storing branch attributes */

1 0

git:master:e5b3474a: core/dset: Add options field to print_dset()
by Henning Westerholt 11 Feb '19

11 Feb '19

Module: kamailio Branch: master Commit: e5b3474ad450f2c11c4e49678e590ac2dccf47ac URL: https://github.com/kamailio/kamailio/commit/e5b3474ad450f2c11c4e49678e590ac… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-11T21:42:26+01:00 core/dset: Add options field to print_dset() Will be used later on to optionally enhance the contacts. --- Modified: src/core/dset.c Modified: src/core/dset.h Modified: src/modules/pv/pv_core.c Modified: src/modules/sl/sl_funcs.c Modified: src/modules/tm/t_reply.c Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/e5b3474ad450f2c11c4e49678e590ac… Patch: https://github.com/kamailio/kamailio/commit/e5b3474ad450f2c11c4e49678e590ac… --- diff --git a/src/core/dset.c b/src/core/dset.c index 5af6252594..239a4f2ebc 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -472,7 +472,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, * end = end of target buffer * Returns 0 on success or -1 on error (buffer is too short) */ -static int print_contact_str(char **dest, str *uri, qvalue_t q, char *end) +static int print_contact_str(char **dest, str *uri, qvalue_t q, char *end, int options) { char *p = *dest; str buf; @@ -507,7 +507,7 @@ static int print_contact_str(char **dest, str *uri, qvalue_t q, char *end) * Create a Contact header field from the dset * array */ -char* print_dset(struct sip_msg* msg, int* len) +char* print_dset(struct sip_msg* msg, int* len, int options) { int cnt = 0; qvalue_t q; @@ -529,7 +529,7 @@ char* print_dset(struct sip_msg* msg, int* len) /* current uri */ if (msg->new_uri.s) { - if (print_contact_str(&p, &msg->new_uri, ruri_q, end) < 0) { + if (print_contact_str(&p, &msg->new_uri, ruri_q, end, options) < 0) { goto memfail; } cnt++; @@ -546,7 +546,7 @@ char* print_dset(struct sip_msg* msg, int* len) p += CONTACT_DELIM_LEN; } - if (print_contact_str(&p, &uri, q, end) < 0) { + if (print_contact_str(&p, &uri, q, end, options) < 0) { goto memfail; } diff --git a/src/core/dset.h b/src/core/dset.h index 603b2023d1..b786cee053 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -158,7 +158,7 @@ void clear_branches(void); * Create a Contact header field from the * list of current branches */ -char* print_dset(struct sip_msg* msg, int* len); +char* print_dset(struct sip_msg* msg, int* len, int options); /*! \brief diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 0419641efd..ac119ef3d3 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1335,7 +1335,7 @@ int pv_get_dset(struct sip_msg *msg, pv_param_t *param, if(msg==NULL) return -1; - s.s = print_dset(msg, &s.len); + s.s = print_dset(msg, &s.len, 0); if (s.s == NULL) return pv_get_null(msg, param, res); s.len -= CRLF_LEN; diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 1e408e653f..c9730d7195 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -150,7 +150,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) /* if that is a redirection message, dump current message set to it */ if (code>=300 && code<400) { - dset.s=print_dset(msg, &dset.len); + dset.s=print_dset(msg, &dset.len, 0); if (dset.s) { add_lump_rpl(msg, dset.s, dset.len, LUMP_RPL_HDR); } diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 81f041fc60..e2058cae78 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -640,7 +640,7 @@ static int _reply( struct cell *trans, struct sip_msg* p_msg, /* if that is a redirection message, dump current message set to it */ if (code>=300 && code<400) { - dset=print_dset(p_msg, &dset_len); + dset=print_dset(p_msg, &dset_len, 0); if (dset) { add_lump_rpl(p_msg, dset, dset_len, LUMP_RPL_HDR); } diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 068608a304..bbe2ceaafe 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -559,7 +559,7 @@ static int xl_get_dset(struct sip_msg *msg, str *res, str *hp, int hi, int hf) if(msg==NULL || res==NULL) return -1; - res->s = print_dset(msg, &res->len); + res->s = print_dset(msg, &res->len, 0); if ((res->s) == NULL) return xl_get_null(msg, res, hp, hi, hf);

1 0

git:master:bff61f7a: core/dset: Cleanup printing the dset
by Henning Westerholt 11 Feb '19

11 Feb '19

Module: kamailio Branch: master Commit: bff61f7a55fe24c34dd62ce91049575f1274021a URL: https://github.com/kamailio/kamailio/commit/bff61f7a55fe24c34dd62ce91049575… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-11T21:42:26+01:00 core/dset: Cleanup printing the dset Eliminate duplicate code --- Modified: src/core/dset.c --- Diff: https://github.com/kamailio/kamailio/commit/bff61f7a55fe24c34dd62ce91049575… Patch: https://github.com/kamailio/kamailio/commit/bff61f7a55fe24c34dd62ce91049575…

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
34
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 2019