sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:master:4917283a: core: dset - comment to document return code for getting branch data

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4917283ae2ed27a852a63cde78e9f8739958ff92 URL: https://github.com/kamailio/kamailio/commit/4917283ae2ed27a852a63cde78e9f87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 core: dset - comment to document return code for getting branch data - differentiate when returning data for valid or invalid branch index --- Modified: src/core/dset.c --- Diff: https://github.com/kamailio/kamailio/commit/4917283ae2ed27a852a63cde78e9f87… Patch: https://github.com/kamailio/kamailio/commit/4917283ae2ed27a852a63cde78e9f87… --- diff --git a/src/core/dset.c b/src/core/dset.c index f1b79ba037..faa61db72b 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -314,6 +314,10 @@ char* next_branch(int* len, qvalue_t* q, str* dst_uri, str* path, return ret; } +/** + * Link branch attributes in the data structure + * - return: -1 (<0) on error; 0 - on no valid branch; 1 - on a valid branch + */ int get_branch_data(unsigned int i, branch_data_t *vbranch) { if(vbranch==NULL) { @@ -348,18 +352,23 @@ int get_branch_data(unsigned int i, branch_data_t *vbranch) vbranch->location_ua.s = branches[i].location_ua; } vbranch->otcpid = branches[i].otcpid; + return 1; } else { vbranch->q = Q_UNSPECIFIED; + return 0; } - - return 0; } +/** + * Link branch attributes in the data structure and advance the iterator on + * return of a valid branch + * - return: -1 (<0) on error; 0 - on no valid branch; 1 - on a valid branch + */ int next_branch_data(branch_data_t *vbranch) { int ret; ret= get_branch_data(branch_iterator, vbranch); - if (ret < 0) { + if (ret <= 0) { return ret; } branch_iterator++;

5 years, 4 months

git:master:a8d3274c: core: dset - function to link branch data in a structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a8d3274c32ba7d7cfb93d0f6d4090a7832db7ff7 URL: https://github.com/kamailio/kamailio/commit/a8d3274c32ba7d7cfb93d0f6d4090a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 core: dset - function to link branch data in a structure - existing functions to retrive branch attributes have too many parameters already --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/a8d3274c32ba7d7cfb93d0f6d4090a7… Patch: https://github.com/kamailio/kamailio/commit/a8d3274c32ba7d7cfb93d0f6d4090a7… --- diff --git a/src/core/dset.c b/src/core/dset.c index 184ddc9e92..f1b79ba037 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -232,9 +232,9 @@ void set_branch_iterator(int n) * more branches */ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, - str* path, unsigned int *flags, - struct socket_info** force_socket, - str *ruid, str *instance, str *location_ua) + str* path, unsigned int *flags, + struct socket_info** force_socket, + str *ruid, str *instance, str *location_ua) { if (i < nr_branches) { *len = branches[i].len; @@ -302,18 +302,69 @@ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, * 0 is returned if there are no more branches */ char* next_branch(int* len, qvalue_t* q, str* dst_uri, str* path, - unsigned int* flags, struct socket_info** force_socket, - str* ruid, str *instance, str *location_ua) + unsigned int* flags, struct socket_info** force_socket, + str* ruid, str *instance, str *location_ua) { char* ret; - + ret=get_branch(branch_iterator, len, q, dst_uri, path, flags, - force_socket, ruid, instance, location_ua); + force_socket, ruid, instance, location_ua); if (likely(ret)) branch_iterator++; return ret; } +int get_branch_data(unsigned int i, branch_data_t *vbranch) +{ + if(vbranch==NULL) { + return -1; + } + memset(vbranch, 0, sizeof(branch_data_t)); + + if (i < nr_branches) { + vbranch->uri.s = branches[i].uri; + vbranch->uri.len = branches[i].len; + vbranch->q = branches[i].q; + if (branches[i].dst_uri_len > 0) { + vbranch->dst_uri.len = branches[i].dst_uri_len; + vbranch->dst_uri.s = branches[i].dst_uri; + } + if (branches[i].path_len > 0) { + vbranch->path.len = branches[i].path_len; + vbranch->path.s = branches[i].path; + } + vbranch->force_socket = branches[i].force_send_socket; + vbranch->flags = branches[i].flags; + if (branches[i].ruid_len > 0) { + vbranch->ruid.len = branches[i].ruid_len; + vbranch->ruid.s = branches[i].ruid; + } + if (branches[i].instance_len > 0) { + vbranch->instance.len = branches[i].instance_len; + vbranch->instance.s =branches[i].instance; + } + if (branches[i].location_ua_len > 0) { + vbranch->location_ua.len = branches[i].location_ua_len; + vbranch->location_ua.s = branches[i].location_ua; + } + vbranch->otcpid = branches[i].otcpid; + } else { + vbranch->q = Q_UNSPECIFIED; + } + + return 0; +} + +int next_branch_data(branch_data_t *vbranch) +{ + int ret; + ret= get_branch_data(branch_iterator, vbranch); + if (ret < 0) { + return ret; + } + branch_iterator++; + return ret; +} /* * Empty the dset array diff --git a/src/core/dset.h b/src/core/dset.h index ebb4e765bb..9a640da704 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -43,7 +43,7 @@ extern int ruri_is_new; /*! \brief * Structure for storing branch attributes */ -struct branch +typedef struct branch { char uri[MAX_URI_SIZE]; unsigned int len; @@ -79,9 +79,20 @@ struct branch /* Branch flags */ flag_t flags; -}; - -typedef struct branch branch_t; +} branch_t; + +typedef struct branch_data { + str uri; + str dst_uri; + qvalue_t q; + str path; + unsigned int flags; + socket_info_t* force_socket; + str ruid; + str instance; + str location_ua; + int otcpid; +} branch_data_t; /*! \brief * Return pointer to branch[idx] structure @@ -163,6 +174,9 @@ char* get_branch( unsigned int i, int* len, qvalue_t* q, str* dst_uri, struct socket_info** force_socket, str* ruid, str *instance, str *location_ua); +int get_branch_data(unsigned int i, branch_data_t *vbranch); +int next_branch_data(branch_data_t *vbranch); + /*! \brief * Empty the array of branches */

5 years, 4 months

git:master:878c41b7: lost: docs - note that http_client param query_result has to be set to 0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 878c41b7dbd1a716d5a2a9281ab99af585737022 URL: https://github.com/kamailio/kamailio/commit/878c41b7dbd1a716d5a2a9281ab99af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 lost: docs - note that http_client param query_result has to be set to 0 --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/878c41b7dbd1a716d5a2a9281ab99af… Patch: https://github.com/kamailio/kamailio/commit/878c41b7dbd1a716d5a2a9281ab99af… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index d4228f3044..b5701d3fb8 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -255,11 +255,13 @@ xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ https://www.digitalocean.com/community/questions/how-to-upgrade-curl-in-cen…</ulink> </para> <para> - Note: http_client_query exported by the http_client API returns the first line of + Note: http_client_query exported by the http_client API returns by default the first line of the HTTP response (query_params.oneline = 1), but the lost module requires the complete response message, which requires query_params.oneline set to 0. In the case lost_query is used with the default http_client API, dereferencing location via HTTP provided with - the Geolocation header causes an error. + the Geolocation header causes an error. Therefore, to work properlu=y, it requires to set + <ulink url="https://www.kamailio.org/docs/modules/devel/modules/http_client.html#http_c…"> + http_client module parameter query_result to 0</ulink>. </para> </section> </chapter>

5 years, 4 months

git:master:0e4e0a16: modules: readme files regenerated - lost ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 0e4e0a162aa4fc4e3b8467c68b20fea992012e18 URL: https://github.com/kamailio/kamailio/commit/0e4e0a162aa4fc4e3b8467c68b20fea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-16T23:01:36+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/0e4e0a162aa4fc4e3b8467c68b20fea… Patch: https://github.com/kamailio/kamailio/commit/0e4e0a162aa4fc4e3b8467c68b20fea… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index e3a2f182ae..cbb49366e7 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -1,4 +1,3 @@ - LOST Module Wolfgang Kampichler @@ -219,7 +218,7 @@ var(uri)\n"); 5. Counters - This module has no specific counters but uses http_client therfore + This module has no specific counters but uses http_client therefore according counters may apply. 6. Remarks

5 years, 4 months

git:master:769dce2f: evapi: use a completely new fake message structure for dispatcher handling

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 769dce2fad66efdbc6cce6951bc60b60bf453a19 URL: https://github.com/kamailio/kamailio/commit/769dce2fad66efdbc6cce6951bc60b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T12:57:33+02:00 evapi: use a completely new fake message structure for dispatcher handling --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/769dce2fad66efdbc6cce6951bc60b6… Patch: https://github.com/kamailio/kamailio/commit/769dce2fad66efdbc6cce6951bc60b6… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index e603753cec..b0e1e8386b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -151,8 +151,10 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) if((rt<0) && (_evapi_event_callback.s==NULL || _evapi_event_callback.len<=0)) return 0; - fmsg = faked_msg_next(); - memcpy(&tmsg, fmsg, sizeof(sip_msg_t)); + if(faked_msg_get_new(&tmsg)<0) { + LM_ERR("failed to get a new faked message\n"); + return -1; + } fmsg = &tmsg; evapi_set_msg_env(fmsg, evenv); backup_rt = get_route_type();

5 years, 4 months

git:master:d7bd8a18: core: clear branches and expose the function for a new faked msg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d7bd8a187546f132547788c47ff9a3947be49957 URL: https://github.com/kamailio/kamailio/commit/d7bd8a187546f132547788c47ff9a39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T12:56:49+02:00 core: clear branches and expose the function for a new faked msg --- Modified: src/core/fmsg.c Modified: src/core/fmsg.h --- Diff: https://github.com/kamailio/kamailio/commit/d7bd8a187546f132547788c47ff9a39… Patch: https://github.com/kamailio/kamailio/commit/d7bd8a187546f132547788c47ff9a39… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 1450509f8c..71ea74a5e2 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -127,6 +127,7 @@ sip_msg_t* faked_msg_get_next_clear(void) int faked_msg_get_new(sip_msg_t *fmsg) { + clear_branches(); if(faked_msg_init_new(fmsg)<0) { return -1; } diff --git a/src/core/fmsg.h b/src/core/fmsg.h index 99eb9f61b3..734b4c0090 100644 --- a/src/core/fmsg.h +++ b/src/core/fmsg.h @@ -29,6 +29,7 @@ sip_msg_t* faked_msg_next(void); sip_msg_t* faked_msg_get_next(void); sip_msg_t* faked_msg_next_clear(void); sip_msg_t* faked_msg_get_next_clear(void); +int faked_msg_get_new(sip_msg_t *fmsg); int faked_msg_match(sip_msg_t *tmsg); #endif

5 years, 4 months

git:master:4a904b5f: core: function to get a new faked message in a specific structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4a904b5fe90253d0d5517cf1a5cdca3695e59ec3 URL: https://github.com/kamailio/kamailio/commit/4a904b5fe90253d0d5517cf1a5cdca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T12:37:58+02:00 core: function to get a new faked message in a specific structure - refactored the code to be able to fill a sip msg structure with content from the faked request --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/4a904b5fe90253d0d5517cf1a5cdca3… Patch: https://github.com/kamailio/kamailio/commit/4a904b5fe90253d0d5517cf1a5cdca3… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 28d24cd116..1450509f8c 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -30,48 +30,69 @@ #define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <sip:you@kamailio.org>;tag=123\r\nTo: <sip:you@kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) -static char _faked_sip_buf[FAKED_SIP_MSG_LEN+1]; -static struct sip_msg _faked_msg; +static char _faked_sip_buf[BUF_SIZE]; +static int _faked_sip_buf_init = 0; +static sip_msg_t _faked_msg; static unsigned int _faked_msg_no = 0; -int faked_msg_init(void) +static unsigned int faked_msg_get_next_id(void) { - if(_faked_msg_no>0) - return 0; - /* init faked sip msg */ + _faked_msg_no += ((_faked_msg_no+1)==0)?2:1; + return _faked_msg_no; +} + +static void faked_msg_buf_init(void) +{ + if(_faked_sip_buf_init!=0) { + return; + } memcpy(_faked_sip_buf, FAKED_SIP_MSG, FAKED_SIP_MSG_LEN); _faked_sip_buf[FAKED_SIP_MSG_LEN] = '\0'; + _faked_sip_buf_init = 1; +} + +static int faked_msg_init_new(sip_msg_t *fmsg) +{ + faked_msg_buf_init(); - memset(&_faked_msg, 0, sizeof(struct sip_msg)); + /* init faked sip msg */ + memset(fmsg, 0, sizeof(sip_msg_t)); - _faked_msg.buf=_faked_sip_buf; - _faked_msg.len=FAKED_SIP_MSG_LEN; + fmsg->buf=_faked_sip_buf; + fmsg->len=FAKED_SIP_MSG_LEN; - _faked_msg.set_global_address=default_global_address; - _faked_msg.set_global_port=default_global_port; + fmsg->set_global_address=default_global_address; + fmsg->set_global_port=default_global_port; - if (parse_msg(_faked_msg.buf, _faked_msg.len, &_faked_msg)!=0) - { - LM_ERR("parse_msg failed\n"); + if (parse_msg(fmsg->buf, fmsg->len, fmsg)!=0) { + LM_ERR("parse faked msg failed\n"); return -1; } - _faked_msg.rcv.proto = PROTO_UDP; - _faked_msg.rcv.src_port = 5060; - _faked_msg.rcv.src_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.src_ip.af = AF_INET; - _faked_msg.rcv.src_ip.len = 4; - _faked_msg.rcv.dst_port = 5060; - _faked_msg.rcv.dst_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.dst_ip.af = AF_INET; - _faked_msg.rcv.dst_ip.len = 4; + fmsg->rcv.proto = PROTO_UDP; + fmsg->rcv.src_port = 5060; + fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.src_ip.af = AF_INET; + fmsg->rcv.src_ip.len = 4; + fmsg->rcv.dst_port = 5060; + fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.dst_ip.af = AF_INET; + fmsg->rcv.dst_ip.len = 4; return 0; } -static inline sip_msg_t* faked_msg_next_id(int mode) +int faked_msg_init(void) +{ + if(_faked_msg_no>0) { + return 0; + } + return faked_msg_init_new(&_faked_msg); +} + +static inline sip_msg_t* faked_msg_build_next(int mode) { - _faked_msg.id = 1 + _faked_msg_no++; + _faked_msg.id = faked_msg_get_next_id(); _faked_msg.pid = my_pid(); memset(&_faked_msg.tval, 0, sizeof(struct timeval)); if(mode) clear_branches(); @@ -80,12 +101,12 @@ static inline sip_msg_t* faked_msg_next_id(int mode) sip_msg_t* faked_msg_next(void) { - return faked_msg_next_id(0); + return faked_msg_build_next(0); } sip_msg_t* faked_msg_next_clear(void) { - return faked_msg_next_id(1); + return faked_msg_build_next(1); } sip_msg_t* faked_msg_get_next(void) @@ -104,6 +125,18 @@ sip_msg_t* faked_msg_get_next_clear(void) return faked_msg_next_clear(); } +int faked_msg_get_new(sip_msg_t *fmsg) +{ + if(faked_msg_init_new(fmsg)<0) { + return -1; + } + fmsg->id = faked_msg_get_next_id(); + fmsg->pid = my_pid(); + memset(&fmsg->tval, 0, sizeof(struct timeval)); + + return 0; +} + int faked_msg_match(sip_msg_t *tmsg) { return ( tmsg == &_faked_msg ) ? 1 : 0;

5 years, 4 months

git:master:860cf242: registrar: lookup() sets the tcp connection id in sip msg and branch structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 860cf242c1d9fb964b8e64acba136af561ffa748 URL: https://github.com/kamailio/kamailio/commit/860cf242c1d9fb964b8e64acba136af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T11:06:42+02:00 registrar: lookup() sets the tcp connection id in sip msg and branch structures --- Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/860cf242c1d9fb964b8e64acba136af… Patch: https://github.com/kamailio/kamailio/commit/860cf242c1d9fb964b8e64acba136af… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 89a0b7f600..682eb7bace 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -227,6 +227,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) sr_xavp_t *xavp=NULL; sip_uri_t path_uri; str path_str; + branch_t *nbranch; ret = -1; @@ -419,6 +420,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) } _m->reg_id = ptr->reg_id; + _m->otcpid = ptr->tcpconn_id; if (ptr->ruid.len) { if (set_ruid(_m, &(ptr->ruid)) < 0) { @@ -507,18 +509,19 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) * regarding path vs. received. */ LM_DBG("instance is %.*s\n", ptr->instance.len, ptr->instance.s); - if (append_branch(_m, &ptr->c, + nbranch = ksr_push_branch(_m, &ptr->c, path_dst.len?&path_dst:&ptr->received, path_dst.len?&path_str:0, ptr->q, ptr->cflags, ptr->sock, ptr->instance.len?&(ptr->instance):0, ptr->instance.len?ptr->reg_id:0, - &ptr->ruid, &ptr->user_agent) - == -1) { + &ptr->ruid, &ptr->user_agent); + if (nbranch==NULL) { LM_ERR("failed to append a branch\n"); /* Also give a chance to the next branches*/ continue; } + nbranch->otcpid = ptr->tcpconn_id; if(ptr->xavp!=NULL) { xavp = xavp_clone_level_nodata(ptr->xavp); if(xavp != NULL) {

5 years, 4 months

git:master:9115bcda: core: dset - function to push a new branch and return its pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9115bcdabaa3da04e3e563bb43a04358b33e2c17 URL: https://github.com/kamailio/kamailio/commit/9115bcdabaa3da04e3e563bb43a0435… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T11:05:35+02:00 core: dset - function to push a new branch and return its pointer --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/9115bcdabaa3da04e3e563bb43a0435… Patch: https://github.com/kamailio/kamailio/commit/9115bcdabaa3da04e3e563bb43a0435… --- diff --git a/src/core/dset.c b/src/core/dset.c index 1803155206..184ddc9e92 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -328,7 +328,7 @@ void clear_branches(void) -/** Add a new branch to the current transaction. +/** Add a new branch to the current destination set. * @param msg sip message, used for getting the uri if not specified (0). * @param uri uri, can be 0 (in which case the uri is taken from msg) * @param dst_uri destination uri, can be 0. @@ -352,7 +352,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, str luri; /* if we have already set up the maximum number - * of branches, don't try new ones + * of branches, don't try new ones */ if (unlikely(nr_branches == sr_dst_max_branches - 1)) { LM_ERR("max nr of branches exceeded\n"); @@ -466,12 +466,40 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, branches[nr_branches].location_ua[0] = '\0'; branches[nr_branches].location_ua_len = 0; } - + nr_branches++; return 1; } +/** Push a new branch to the current destination set. + * @param msg sip message, used for getting the uri if not specified (0). + * @param uri uri, can be 0 (in which case the uri is taken from msg) + * @param dst_uri destination uri, can be 0. + * @param path path vector (passed in a string), can be 0. + * @param q q value. + * @param flags per branch flags. + * @param force_socket socket that should be used when sending. + * @param instance sip instance contact header param value + * @param reg_id reg-id contact header param value + * @param ruid ruid value from usrloc + * @param location_ua location user agent + * + * @return NULL on failure, new branch pointer on success. + */ +branch_t* ksr_push_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* ruid, str* location_ua) +{ + if(append_branch(msg, uri, dst_uri, path, q, flags, force_socket, + instance, reg_id, ruid, location_ua)<0) { + return NULL; + } + return &branches[nr_branches-1]; +} + /*! \brief * Combines the given elements into a Contact header field * dest = target buffer, will be updated to new position after the printed contact diff --git a/src/core/dset.h b/src/core/dset.h index 96f31978a6..ebb4e765bb 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -94,7 +94,16 @@ branch_t *get_sip_branch(int idx); int drop_sip_branch(int idx); /*! \brief - * Add a new branch to current transaction + * Push a new branch to current destination set + */ +branch_t *ksr_push_branch(sip_msg_t* 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* ruid, str* location_ua); + +/*! \brief + * Add a new branch to current destination set */ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, qvalue_t q, unsigned int flags,

5 years, 4 months

git:master:f3b977d3: core: store tcp connection id in sip msg and branch structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f3b977d39ca72e5787a5b97ee2cf154adbe7d0ca URL: https://github.com/kamailio/kamailio/commit/f3b977d39ca72e5787a5b97ee2cf154… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T10:42:43+02:00 core: store tcp connection id in sip msg and branch structure - try to use it to identify outbound connection for stateless forward() --- Modified: src/core/action.c Modified: src/core/dset.h Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/f3b977d39ca72e5787a5b97ee2cf154… Patch: https://github.com/kamailio/kamailio/commit/f3b977d39ca72e5787a5b97ee2cf154… --- diff --git a/src/core/action.c b/src/core/action.c index 45581ba312..8211cf00f7 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -383,10 +383,16 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) init_dest_info(&dst); if (a->type==FORWARD_UDP_T) dst.proto=PROTO_UDP; #ifdef USE_TCP - else if (a->type==FORWARD_TCP_T) dst.proto= PROTO_TCP; + else if (a->type==FORWARD_TCP_T) { + dst.proto= PROTO_TCP; + dst.id = msg->otcpid; + } #endif #ifdef USE_TLS - else if (a->type==FORWARD_TLS_T) dst.proto= PROTO_TLS; + else if (a->type==FORWARD_TLS_T) { + dst.proto= PROTO_TLS; + dst.id = msg->otcpid; + } #endif #ifdef USE_SCTP else if (a->type==FORWARD_SCTP_T) dst.proto=PROTO_SCTP; diff --git a/src/core/dset.h b/src/core/dset.h index 65b54c3104..96f31978a6 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -48,7 +48,7 @@ struct branch char uri[MAX_URI_SIZE]; unsigned int len; - /* Real destination of the request */ + /* Real destination of the request */ char dst_uri[MAX_URI_SIZE]; unsigned int dst_uri_len; @@ -74,6 +74,9 @@ struct branch char location_ua[MAX_UA_SIZE + 1]; unsigned int location_ua_len; + /* tcp connection id */ + int otcpid; + /* Branch flags */ flag_t flags; }; diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 5dff970206..827c541086 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -378,6 +378,7 @@ typedef struct sip_msg { unsigned int reg_id; str ruid; str location_ua; + int otcpid; /*!< outbound tcp connection id, if known */ /* structure with fields that are needed for local processing * - not cloned to shm, reset to 0 in the clone */

5 years, 4 months

← Newer
1
...
17
18
19
20
21
22
23
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019