sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
376 discussions

git:master: rtpengine: docs update
by Richard Fuchs 09 Sep '14

09 Sep '14

Module: sip-router Branch: master Commit: e6591dc75d34e8522060ea71148b4cdcae139234 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6591dc… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Tue Sep 9 10:37:53 2014 -0400 rtpengine: docs update --- modules/rtpengine/doc/rtpengine_admin.xml | 46 +++++++++++++++-------------- 1 files changed, 24 insertions(+), 22 deletions(-) diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 7907fb5..fdc9a2d 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -288,8 +288,8 @@ rtpengine_offer(); <para> Rewrites &sdp; body to ensure that media is passed through an &rtp; proxy. To be invoked - on INVITE for the cases the SDPs are in INVITE and 200 OK and on 200 OK - when SDPs are in 200 OK and ACK. + on INVITE for the cases the &sdp; bodies are in INVITE and 200 OK and on 200 OK + when &sdp; bodies are in 200 OK and ACK. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -325,7 +325,8 @@ rtpengine_offer(); </para></listitem> <listitem><para> <emphasis>asymmetric</emphasis> - flags that UA from which message is - received doesn't support symmetric RTP. (automatically sets the 'r' flag) + received doesn't support symmetric &rtp;. Disables learning of endpoint addresses + in the Sipwise rtpengine proxy. </para></listitem> <listitem><para> <emphasis>force-answer</emphasis> - force <quote>answer</quote>, that is, @@ -359,8 +360,8 @@ rtpengine_offer(); in order to do automatic bridging between IPv4 on the "internal network" and IPv6 on the "external network". Instead of explicitly instructing the &rtp; proxy to select a particular address - family, the distinction is done by the given IP in the SDP body by - the RTP proxy itself. Not supported by Sipwise rtpengine. + family, the distinction is done by the given IP in the &sdp; body by + the &rtp; proxy itself. Not supported by Sipwise rtpengine. </para></listitem> <listitem><para> <emphasis>address-family=...</emphasis> - instructs the &rtp; proxy that the @@ -387,10 +388,10 @@ rtpengine_offer(); a chain of proxies. Not supported and ignored by Sipwise rtpengine. </para></listitem> <listitem><para> - <emphasis>trust-address</emphasis> - flags that IP address in SDP should + <emphasis>trust-address</emphasis> - flags that IP address in &sdp; should be trusted. Without this flag, the &rtp; proxy ignores address in - the SDP and uses source address of the &sip; message as media - address which is passed to the RTP proxy. + the &sdp; and uses source address of the &sip; message as media + address which is passed to the &rtp; proxy. </para></listitem> <listitem><para> <emphasis>replace-origin</emphasis> - flags that IP from the origin @@ -398,18 +399,19 @@ rtpengine_offer(); </para></listitem> <listitem><para> <emphasis>replace-session-connection</emphasis> - flags to change the session-level - SDP connection (c=) IP if media description also includes + &sdp; connection (c=) IP if media description also includes connection information. </para></listitem> <listitem><para> <emphasis>symmetric</emphasis> - flags that for the UA from which - message is received, support symmetric RTP must be forced. + message is received, support symmetric &rtp; must be forced. Does nothing with + the Sipwise rtpengine proxy as it is the default. </para></listitem> <listitem><para> <emphasis>repacketize=NN</emphasis> - requests the &rtp; proxy to perform - re-packetization of RTP traffic coming from the UA which + re-packetization of &rtp; traffic coming from the UA which has sent the current message to increase or decrease payload - size per each RTP packet forwarded if possible. The NN is the + size per each &rtp; packet forwarded if possible. The NN is the target payload size in ms, for the most codecs its value should be in 10ms increments, however for some codecs the increment could differ (e.g. 30ms for GSM or 20ms for G.723). The @@ -426,7 +428,7 @@ rtpengine_offer(); discard any ICE attributes already present in the &sdp; body and then generate and insert new ICE data, leaving itself as the <emphasis>only</emphasis> ICE candidates; - <quote>force_relay</quote> - + <quote>force-relay</quote> - discard any <quote>relay</quote> type ICE attributes already present in the &sdp; body and then generate and insert itself as the <emphasis>only</emphasis> ICE <quote>relay</quote> candidates; @@ -488,7 +490,7 @@ rtpengine_offer(); be used in the &sdp; body. Address family is detected automatically. </para></listitem> <listitem><para> - <emphasis>TOS=...</emphasis> - change the IP TOS value for all outgoing RTP + <emphasis>TOS=...</emphasis> - change the IP TOS value for all outgoing &rtp; packets within the entire call in both directions. Only honoured in an <quote>offer</quote>, ignored for an <quote>answer</quote>. Valid values are 0 through 255, given in decimal. If this option is not specified, the TOS @@ -544,8 +546,8 @@ onreply_route[2] <para> Rewrites &sdp; body to ensure that media is passed through an &rtp; proxy. To be invoked - on 200 OK for the cases the SDPs are in INVITE and 200 OK and on ACK - when SDPs are in 200 OK and ACK. + on 200 OK for the cases the &sdp; bodies are in INVITE and 200 OK and on ACK + when &sdp; bodies are in 200 OK and ACK. </para> <para> See rtpengine_offer() function description above for the meaning of the @@ -606,19 +608,19 @@ rtpengine_delete(); <itemizedlist> <listitem> <para> - If INVITE with SDP, then do <function>rtpengine_offer()</function> + If INVITE with &sdp;, then do <function>rtpengine_offer()</function> </para> </listitem> <listitem> <para> - If INVITE with SDP, when the tm module is loaded, mark transaction with + If INVITE with &sdp;, when the tm module is loaded, mark transaction with internal flag FL_SDP_BODY to know that the 1xx and 2xx are for <function>rtpengine_answer()</function> </para> </listitem> <listitem> <para> - If ACK with SDP, then do <function>rtpengine_answer()</function> + If ACK with &sdp;, then do <function>rtpengine_answer()</function> </para> </listitem> <listitem> @@ -633,8 +635,8 @@ rtpengine_delete(); </listitem> <listitem> <para> - If reply with SDP to INVITE having code 1xx and 2xx, then - do <function>rtpengine_answer()</function> if the request had SDP or tm is not loaded, + If reply with &sdp; to INVITE having code 1xx and 2xx, then + do <function>rtpengine_answer()</function> if the request had &sdp; or tm is not loaded, otherwise do <function>rtpengine_offer()</function> </para> </listitem> @@ -659,7 +661,7 @@ rtpengine_manage(); </title> <para> This function will send a signal to the &rtp; proxy to record - the RTP stream on the &rtp; proxy. + the &rtp; stream on the &rtp; proxy. <emphasis>This function is not supported by Sipwise rtpengine at the moment!</emphasis> </para> <para>

1 0

git:master: rtpengine: support arbitrary direction= flags for interface bridging
by Richard Fuchs 09 Sep '14

09 Sep '14

Module: sip-router Branch: master Commit: d54bcfad39f6b3f79a826cab4df83bb7eea189a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d54bcfa… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Tue Sep 9 10:30:45 2014 -0400 rtpengine: support arbitrary direction= flags for interface bridging --- modules/rtpengine/doc/rtpengine_admin.xml | 32 ++++++++++++++++------------ modules/rtpengine/rtpengine.c | 2 + 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 3a82e8b..7907fb5 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -334,20 +334,24 @@ rtpengine_offer(); completed. </para></listitem> <listitem><para> - <emphasis>internal, external</emphasis> - these flags specify the direction of - the &sip; message. These flags only make sense when the &rtp; proxy is running - in bridge mode. <quote>internal</quote> corresponds to the proxy's first - interface, <quote>external</quote> corresponds to the &rtp; proxy's - second interface. You always have to specify two flags to define - the incoming network and the outgoing network. For example, <quote>internal - external</quote> should be - used for &sip; message received from the local interface and sent out on the - external interface, and <quote>external internal</quote> vice versa. Other - options are <quote>internal internal</quote> and <quote>external - external</quote>. - So, for example if a &sip; requests is processed with <quote>internal - external</quote> flags, the corresponding - response must be processed with <quote>internal external</quote> flags. + <emphasis>direction=...</emphasis> - this option specifies a logical network + interface and should be given exactly twice. It enables &rtp; bridging between + different addresses or networks of the same family (e.g. IPv4 to IPv4). The + first instance of the option + specifies the interface that the originator of this message should be using, + while the second instance specifies the interface that the target should be + using. For example, if the &sip; message was sent by an endpoint on a private + network and will be sent to an endpoint on the public internet, you would use + <quote>direction=priv direction=pub</quote> if those two logical network + interfaces were called <quote>priv</quote> and <quote>pub</quote> in your + &rtp; proxy's configuration respectively. The direction must only be specified + in for initial &sdp; offer; answers or subsequent offers can omit this option. + </para></listitem> + <listitem><para> + <emphasis>internal, external</emphasis> - shorthand for + <quote>direction=internal</quote> and <quote>direction=external</quote> + respectively. Useful for brevity or as legacy option if the &rtp; proxy only + supports two network interfaces instead of multiple, arbitrarily named ones. </para></listitem> <listitem><para> <emphasis>auto-bridge</emphasis> - this flag an alternative to the diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index e47c2ea..063e3d1 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -1240,6 +1240,8 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu ng_flags->transport = 0x103; goto next; } + else if (str_eq(&key, "direction")) + bencode_list_add_str(ng_flags->direction, &val); break; case 10:

1 0

git:master: rtpengine: support daisy-chaining two RTP proxies
by Richard Fuchs 09 Sep '14

09 Sep '14

Module: sip-router Branch: master Commit: f049d553bf4de88c7f1c94c7aeaeb02620d6fec6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f049d55… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Tue Sep 9 10:07:33 2014 -0400 rtpengine: support daisy-chaining two RTP proxies --- modules/rtpengine/doc/rtpengine_admin.xml | 24 ++- modules/rtpengine/rtpengine.c | 268 +++++++++++++++++++---------- 2 files changed, 195 insertions(+), 97 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f04…

1 0

git:master: htable: iterator implementation for hash tables
by Elena-Ramona Modroiu 09 Sep '14

09 Sep '14

Module: sip-router Branch: master Commit: 0c62f0d960ce4786bbf8d0bd9b7b0ce8fcf0cd7b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c62f0d… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Sep 9 14:56:35 2014 +0200 htable: iterator implementation for hash tables - new functions: - sht_iterator_start(iname, hname) - sht_iterator_next(iname) - sht_iterator_end(iname) - iname is a string to identify the iterator - hname is the name of a hash table - note that the slot is left locked by sht_iterator_next(), therefore there must be no update to the hash table content in between sht_iterator_start() and sht_iterator_end() - sht_iterator_end() must be called for each sht_iterator_start() with the same iterator name - internally can be up to 4 iterators at one time, they can have different names - the current item in the iterator is accessible via: - $shtitkey(iname) - $shtitval(iname) - example sht_iterator_start("i1", "h1"); while(sht_iterator_next("i1")) { xlog("h1[$shtitkey(i1)] is: $shtitval(i1)\n"); } sht_iterator_end("i1"); --- modules/htable/ht_api.c | 178 +++++++++++++++++++++++++++++++++++++++++++++++ modules/htable/ht_api.h | 6 ++ modules/htable/ht_var.c | 49 +++++++++++++ modules/htable/ht_var.h | 5 ++ modules/htable/htable.c | 63 +++++++++++++++++ 5 files changed, 301 insertions(+), 0 deletions(-) diff --git a/modules/htable/ht_api.c b/modules/htable/ht_api.c index af227c0..1d39149 100644 --- a/modules/htable/ht_api.c +++ b/modules/htable/ht_api.c @@ -1332,3 +1332,181 @@ int ht_count_cells_re(str *sre, ht_t *ht, int mode) return cnt; } +#define HT_ITERATOR_SIZE 4 +#define HT_ITERATOR_NAME_SIZE 32 + +typedef struct ht_iterator { + str name; + char bname[HT_ITERATOR_NAME_SIZE]; + ht_t *ht; + int slot; + ht_cell_t *it; +} ht_iterator_t; + +static ht_iterator_t _ht_iterators[HT_ITERATOR_SIZE]; + +void ht_iterator_init(void) +{ + memset(_ht_iterators, 0, HT_ITERATOR_SIZE*sizeof(ht_iterator_t)); +} + +int ht_iterator_start(str *iname, str *hname) +{ + int i; + int k; + + k = -1; + for(i=0; i<HT_ITERATOR_SIZE; i++) + { + if(_ht_iterators[i].name.len>0) + { + if(_ht_iterators[i].name.len==iname->len + && strncmp(_ht_iterators[i].name.s, iname->s, iname->len)==0) + { + k = i; + break; + } + } else { + if(k==-1) k = i; + } + } + if(k==-1) + { + LM_ERR("no iterator available - max number is %d\n", HT_ITERATOR_SIZE); + return -1; + } + if(_ht_iterators[k].name.len>0) + { + if(_ht_iterators[k].ht!=NULL && _ht_iterators[k].it!=NULL) + { + if(_ht_iterators[k].slot>=0 && _ht_iterators[k].slot<_ht_iterators[k].ht->htsize) + { + lock_release(&_ht_iterators[k].ht->entries[_ht_iterators[k].slot].lock); + } + } + } else { + if(iname->len>=HT_ITERATOR_NAME_SIZE) + { + LM_ERR("iterator name is too big [%.*s] (max %d)\n", + iname->len, iname->s, HT_ITERATOR_NAME_SIZE); + return -1; + } + strncpy(_ht_iterators[k].bname, iname->s, iname->len); + _ht_iterators[k].bname[iname->len] = '\0'; + } + _ht_iterators[k].it = NULL; + _ht_iterators[k].slot = 0; + _ht_iterators[k].ht = ht_get_table(hname); + if(_ht_iterators[k].ht==NULL) + { + LM_ERR("cannot get hash table [%.*s]\n", hname->len, hname->s); + return -1; + } + return 0; +} + +int ht_iterator_next(str *iname) +{ + int i; + int k; + + for(i=0; i<HT_ITERATOR_SIZE; i++) + { + if(_ht_iterators[i].name.len>0) + { + if(_ht_iterators[i].name.len==iname->len + && strncmp(_ht_iterators[i].name.s, iname->s, iname->len)==0) + { + k = i; + break; + } + } else { + if(k==-1) k = i; + } + } + if(k==-1) + { + LM_ERR("iterator not found [%.*s]\n", iname->len, iname->s); + return -1; + } + if(_ht_iterators[k].ht==NULL) + { + LM_ERR("iterator not initialized [%.*s]\n", iname->len, iname->s); + return -1; + } + if(_ht_iterators[k].it==NULL) + { + /* first execution - start from first slot */ + _ht_iterators[k].slot=0; + } else { + _ht_iterators[k].it = _ht_iterators[k].it->next; + if(_ht_iterators[k].it!=NULL) + { + /* next item is in the same slot */ + return 0; + } + /* next is not in the same slot - release and try next one */ + _ht_iterators[k].it = NULL; + lock_release(&_ht_iterators[k].ht->entries[_ht_iterators[k].slot].lock); + _ht_iterators[k].slot++; + } + + for( ; _ht_iterators[k].slot<_ht_iterators[k].ht->htsize; _ht_iterators[k].slot++) + { + lock_get(&_ht_iterators[k].ht->entries[_ht_iterators[k].slot].lock); + if(_ht_iterators[k].ht->entries[_ht_iterators[k].slot].first!=NULL) + { + _ht_iterators[k].it = _ht_iterators[k].ht->entries[_ht_iterators[k].slot].first; + return 0; + } + lock_release(&_ht_iterators[k].ht->entries[_ht_iterators[k].slot].lock); + } + return -1; +} + +int ht_iterator_end(str *iname) +{ + int i; + + for(i=0; i<HT_ITERATOR_SIZE; i++) + { + if(_ht_iterators[i].name.len>0) + { + if(_ht_iterators[i].name.len==iname->len + && strncmp(_ht_iterators[i].name.s, iname->s, iname->len)==0) + { + if(_ht_iterators[i].ht!=NULL && _ht_iterators[i].it!=NULL) + { + if(_ht_iterators[i].slot>=0 && _ht_iterators[i].slot<_ht_iterators[i].ht->htsize) + { + lock_release(&_ht_iterators[i].ht->entries[_ht_iterators[i].slot].lock); + } + } + memset(&_ht_iterators[i], 0, sizeof(ht_iterator_t)); + return 0; + } + } + } + + return -1; +} + +ht_cell_t* ht_iterator_get_current(str *iname) +{ + int i; + if(iname==NULL || iname->len<=0) + return NULL; + + for(i=0; i<HT_ITERATOR_SIZE; i++) + { + if(_ht_iterators[i].name.len>0) + { + if(_ht_iterators[i].name.len==iname->len + && strncmp(_ht_iterators[i].name.s, iname->s, iname->len)==0) + { + return _ht_iterators[i].it; + } + } + } + return NULL; +} diff --git a/modules/htable/ht_api.h b/modules/htable/ht_api.h index 924b4b2..d7ba916 100644 --- a/modules/htable/ht_api.h +++ b/modules/htable/ht_api.h @@ -104,4 +104,10 @@ int ht_count_cells_re(str *sre, ht_t *ht, int mode); ht_t *ht_get_root(void); int ht_reset_content(ht_t *ht); +void ht_iterator_init(void); +int ht_iterator_start(str *iname, str *hname); +int ht_iterator_next(str *iname); +int ht_iterator_end(str *iname); +ht_cell_t* ht_iterator_get_current(str *iname); + #endif diff --git a/modules/htable/ht_var.c b/modules/htable/ht_var.c index 50901d3..5ac76cb 100644 --- a/modules/htable/ht_var.c +++ b/modules/htable/ht_var.c @@ -410,3 +410,52 @@ int pv_get_ht_expired_cell(struct sip_msg *msg, pv_param_t *param, return 0; } + +int pv_parse_iterator_name(pv_spec_t *sp, str *in) +{ + if(in->len<=0) + { + return -1; + } + + sp->pvp.pvn.u.isname.name.s.s = in->s; + sp->pvp.pvn.u.isname.name.s.len = in->len; + sp->pvp.pvn.u.isname.type = 0; + sp->pvp.pvn.type = PV_NAME_INTSTR; + + return 0; +} + +int pv_get_iterator_key(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + ht_cell_t *it=NULL; + if (res == NULL) + { + return -1; + } + + it = ht_iterator_get_current(&param->pvn.u.isname.name.s); + if(it==NULL) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &it->name); +} + +int pv_get_iterator_val(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + ht_cell_t *it=NULL; + if (res == NULL) + { + return -1; + } + + it = ht_iterator_get_current(&param->pvn.u.isname.name.s); + if(it==NULL) { + return pv_get_null(msg, param, res); + } + if(it->flags&AVP_VAL_STR) + return pv_get_strval(msg, param, res, &it->value.s); + + /* integer */ + return pv_get_sintval(msg, param, res, it->value.n); +} diff --git a/modules/htable/ht_var.h b/modules/htable/ht_var.h index 14320a1..4ffe8c2 100644 --- a/modules/htable/ht_var.h +++ b/modules/htable/ht_var.h @@ -46,4 +46,9 @@ int pv_get_ht_dec(struct sip_msg *msg, pv_param_t *param, int pv_parse_ht_expired_cell(pv_spec_t *sp, str *in); int pv_get_ht_expired_cell(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + +int pv_parse_iterator_name(pv_spec_t *sp, str *in); +int pv_get_iterator_key(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_get_iterator_val(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + #endif diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 563773e..90a5532 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -66,6 +66,9 @@ static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo); static int ht_slot_lock(struct sip_msg* msg, char* key, char* foo); static int ht_slot_unlock(struct sip_msg* msg, char* key, char* foo); static int ht_reset(struct sip_msg* msg, char* htname, char* foo); +static int w_ht_iterator_start(struct sip_msg* msg, char* iname, char* hname); +static int w_ht_iterator_next(struct sip_msg* msg, char* iname, char* foo); +static int w_ht_iterator_end(struct sip_msg* msg, char* iname, char* foo); int ht_param(modparam_t type, void* val); @@ -89,6 +92,10 @@ static pv_export_t mod_pvs[] = { pv_parse_ht_name, 0, 0, 0 }, { {"shtrecord", sizeof("shtrecord")-1}, PVT_OTHER, pv_get_ht_expired_cell, 0, pv_parse_ht_expired_cell, 0, 0, 0 }, + { {"shtitkey", sizeof("shtitkey")-1}, PVT_OTHER, pv_get_iterator_key, 0, + pv_parse_iterator_name, 0, 0, 0 }, + { {"shtitval", sizeof("shtitval")-1}, PVT_OTHER, pv_get_iterator_val, 0, + pv_parse_iterator_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -113,6 +120,12 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"sht_reset", (cmd_function)ht_reset, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sht_iterator_start", (cmd_function)w_ht_iterator_start, 2, fixup_spve_spve, 0, + ANY_ROUTE}, + {"sht_iterator_next", (cmd_function)w_ht_iterator_next, 1, fixup_spve_null, 0, + ANY_ROUTE}, + {"sht_iterator_end", (cmd_function)w_ht_iterator_end, 1, fixup_spve_null, 0, + ANY_ROUTE}, {"bind_htable", (cmd_function)bind_htable, 0, 0, 0, ANY_ROUTE}, {0,0,0,0,0,0} @@ -201,6 +214,8 @@ static int mod_init(void) return -1; } + ht_iterator_init(); + return 0; } @@ -379,6 +394,54 @@ static int ht_reset(struct sip_msg* msg, char* htname, char* foo) return 1; } +static int w_ht_iterator_start(struct sip_msg* msg, char* iname, char* hname) +{ + str siname; + str shname; + + if(fixup_get_svalue(msg, (gparam_t*)iname, &siname)<0 || siname.len<=0) + { + LM_ERR("cannot get iterator name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)hname, &shname)<0 || shname.len<=0) + { + LM_ERR("cannot get hash table name\n"); + return -1; + } + + if(ht_iterator_start(&siname, &shname)<0) + return -1; + return 1; +} + +static int w_ht_iterator_next(struct sip_msg* msg, char* iname, char* foo) +{ + str siname; + + if(fixup_get_svalue(msg, (gparam_t*)iname, &siname)<0 || siname.len<=0) + { + LM_ERR("cannot get iterator name\n"); + return -1; + } + if(ht_iterator_next(&siname)<0) + return -1; + return 1; +} + +static int w_ht_iterator_end(struct sip_msg* msg, char* iname, char* foo) +{ + str siname; + + if(fixup_get_svalue(msg, (gparam_t*)iname, &siname)<0 || siname.len<=0) + { + LM_ERR("cannot get iterator name\n"); + return -1; + } + if(ht_iterator_end(&siname)<0) + return -1; + return 1; +} /** * lock the slot for a given key in a hash table

1 0

git:master: htable: documentation for iterator functions
by Elena-Ramona Modroiu 09 Sep '14

09 Sep '14

Module: sip-router Branch: master Commit: 4776b44ea9c5546c37fea9f3886148a17c735fe5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4776b44… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Sep 9 15:24:47 2014 +0200 htable: documentation for iterator functions --- modules/htable/README | 73 ++++++++++++++++++++++++++++ modules/htable/doc/htable_admin.xml | 91 +++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 0 deletions(-) diff --git a/modules/htable/README b/modules/htable/README index 7a7c3cf..5a27593 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -61,6 +61,9 @@ Ovidiu Sas 4.4. sht_reset(htable) 4.5. sht_lock(htable=>key) 4.6. sht_unlock(htable=>key) + 4.7. sht_iterator_start(iname, hname) + 4.8. sht_iterator_end(iname) + 4.9. sht_iterator_next(iname) 5. Exported pseudo-variables 6. MI Commands @@ -109,6 +112,9 @@ Ovidiu Sas 1.20. sht_reset usage 1.21. sht_lock usage 1.22. sht_unlock usage + 1.23. sht_iterator_start usage + 1.24. sht_iterator_end usage + 1.25. sht_iterator_next usage Chapter 1. Admin Guide @@ -145,6 +151,9 @@ Chapter 1. Admin Guide 4.4. sht_reset(htable) 4.5. sht_lock(htable=>key) 4.6. sht_unlock(htable=>key) + 4.7. sht_iterator_start(iname, hname) + 4.8. sht_iterator_end(iname) + 4.9. sht_iterator_next(iname) 5. Exported pseudo-variables 6. MI Commands @@ -606,6 +615,9 @@ modparam("htable", "enable_dmq", 1) 4.4. sht_reset(htable) 4.5. sht_lock(htable=>key) 4.6. sht_unlock(htable=>key) + 4.7. sht_iterator_start(iname, hname) + 4.8. sht_iterator_end(iname) + 4.9. sht_iterator_next(iname) 4.1. sht_print() @@ -682,6 +694,67 @@ $sht(ha=>test) = $sht(ha=>test) + 10; sht_unlock("ha=>test"); ... +4.7. sht_iterator_start(iname, hname) + + Start an iterator for hash table named by the value of parameter hname. + The parameter iname is used to identify the iterator. There can be up + to 4 iterators at the same time, with different name. + + Both parameters can be dynamic strings with variables. + + IMPORTANT: the slot of the hash table is left locked when retrieving in + item. Therefore be sure you do not update the content of the hash table + in between sht_iterator_start() and sht_iterator_end(), because it may + end up in dead lock. + + This function can be used from ANY_ROUTE. + + Example 1.23. sht_iterator_start usage +... +sht_iterator_start("i1", "h1"); +... + +4.8. sht_iterator_end(iname) + + Close the iterator identified by iname parameter and release the hash + table slot aquired by the iterator. The iname value must be the same + used for sht_iterator_start(). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.24. sht_iterator_end usage +... +sht_iterator_end("i1"); +... + +4.9. sht_iterator_next(iname) + + Move the iterator to the next item in hash table. It must be called + also after sht_iterator_start() to get the first item in the hash + table. Items are returned as they are found in the hash table slot, + starting with the first slot. + + The return code is false when there is no (more) item in the hash + table. + + The item name and value are accessible via variables: $shtitkey(iname) + and $shtitval(iname). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.25. sht_iterator_next usage +... + sht_iterator_start("i1", "h1"); + while(sht_iterator_next("i1")) { + xlog("h1[$shtitkey(i1)] is: $shtitval(i1)\n"); + } + sht_iterator_end("i1"); +... + 5. Exported pseudo-variables * $sht(htable=>key) diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index 6427a28..bfba088 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -770,6 +770,97 @@ sht_unlock("ha=>test"); </programlisting> </example> </section> + <section id="htable.f.sht_iterator_start"> + <title> + <function moreinfo="none">sht_iterator_start(iname, hname)</function> + </title> + <para> + Start an iterator for hash table named by the value of parameter + hname. The parameter iname is used to identify the iterator. There + can be up to 4 iterators at the same time, with different name. + </para> + <para> + Both parameters can be dynamic strings with variables. + </para> + <para> + IMPORTANT: the slot of the hash table is left locked when + retrieving in item. Therefore be sure you do not update the + content of the hash table in between sht_iterator_start() + and sht_iterator_end(), because it may end up in dead lock. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_iterator_start</function> usage</title> + <programlisting format="linespecific"> +... +sht_iterator_start("i1", "h1"); +... +</programlisting> + </example> + </section> + <section id="htable.f.sht_iterator_end"> + <title> + <function moreinfo="none">sht_iterator_end(iname)</function> + </title> + <para> + Close the iterator identified by iname parameter and release + the hash table slot aquired by the iterator. The iname value + must be the same used for sht_iterator_start(). + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_iterator_end</function> usage</title> + <programlisting format="linespecific"> +... +sht_iterator_end("i1"); +... +</programlisting> + </example> + </section> + <section id="htable.f.sht_iterator_next"> + <title> + <function moreinfo="none">sht_iterator_next(iname)</function> + </title> + <para> + Move the iterator to the next item in hash table. It must + be called also after sht_iterator_start() to get the first + item in the hash table. Items are returned as they are found + in the hash table slot, starting with the first slot. + </para> + <para> + The return code is false when there is no (more) item in the + hash table. + </para> + <para> + The item name and value are accessible via variables: + $shtitkey(iname) and $shtitval(iname). + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_iterator_next</function> usage</title> + <programlisting format="linespecific"> +... + sht_iterator_start("i1", "h1"); + while(sht_iterator_next("i1")) { + xlog("h1[$shtitkey(i1)] is: $shtitval(i1)\n"); + } + sht_iterator_end("i1"); +... +</programlisting> + </example> + </section> </section> <section> <title>Exported pseudo-variables</title>

1 0

name of rtpengine ICE=force_relay flag
by Juha Heinanen 09 Sep '14

09 Sep '14

i made a mistake when i introduced ICE=force_relay flag. for consistency, the flag should have been ICE=force-relay. is it too late to fix the name? -- juha

2 2

git:master: jsonrpc: reset the local reply structure before executing new commands
by Daniel-Constantin Mierla 09 Sep '14

09 Sep '14

Module: sip-router Branch: master Commit: 43de8b203c569f8ebe47f28a9049d671a92852ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43de8b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 9 12:28:09 2014 +0200 jsonrpc: reset the local reply structure before executing new commands --- modules/jsonrpc-s/jsonrpc-s_mod.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index 1951845..b004108 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -1003,7 +1003,6 @@ static int jsonrpc_exec(sip_msg_t* msg, char* cmd, char* s2) LM_ERR("Failed to init the json document\n"); return -1; } - ctx->jreq->buf = scmd; ctx->jreq->root = srjson_Parse(ctx->jreq, ctx->jreq->buf.s); if(ctx->jreq->root == NULL) @@ -1014,6 +1013,8 @@ static int jsonrpc_exec(sip_msg_t* msg, char* cmd, char* s2) } ret = -1; if (jsonrpc_init_reply(ctx) < 0) goto send_reply; + jsonrpc_reset_plain_reply(ctx->jrpl->free_fn); + /* sanity checks on jsonrpc request */ nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "jsonrpc");

1 0

git:master: parser: Fix parsing of Retry-After header
by Hugh Waite 09 Sep '14

09 Sep '14

Module: sip-router Branch: master Commit: accfbe0abb0d811e249b687cb6047c9234a6d884 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=accfbe0… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Mon Sep 8 17:46:55 2014 +0100 parser: Fix parsing of Retry-After header - Allow no space between duration and optional comment --- parser/parse_retry_after.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/parser/parse_retry_after.c b/parser/parse_retry_after.c index 2b37f91..5c30830 100644 --- a/parser/parse_retry_after.c +++ b/parser/parse_retry_after.c @@ -59,6 +59,7 @@ char* parse_retry_after(char* const buf, const char* const end, unsigned* const case ';': case '\r': case '\n': + case '(': goto found; default: /* invalid char */

1 0

git:master: jsonrpc-s: new config variable $jsonrpl(key)
by Daniel-Constantin Mierla 09 Sep '14

09 Sep '14

Module: sip-router Branch: master Commit: 01e234a1e42fadcb9f3d14eedbcace1bb2ae56bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01e234a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 9 12:06:03 2014 +0200 jsonrpc-s: new config variable $jsonrpl(key) - access jsonrpc reply when using jsonrpc_exec(cmd) - the key can be: - code - the response code as when the jsonrpc would have been executed over http - text - the text following the code as when the jsonrpc would have been executed over http - body - the body of the jsonrpc response - the full json document --- modules/jsonrpc-s/jsonrpc-s_mod.c | 90 +++++++++++++++++++++++++++++++------ 1 files changed, 76 insertions(+), 14 deletions(-) diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index ebbf4c6..1951845 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -99,16 +99,25 @@ static param_export_t params[] = { {0, 0, 0} }; +static int jsonrpc_pv_get_jrpl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int jsonrpc_pv_parse_jrpl_name(pv_spec_t *sp, str *in); + +static pv_export_t mod_pvs[] = { + { {"jsonrpl", sizeof("jsonrpl")-1}, PVT_OTHER, jsonrpc_pv_get_jrpl, 0, + jsonrpc_pv_parse_jrpl_name, 0, 0, 0 }, + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + /** module exports */ struct module_exports exports= { "jsonrpc-s", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, params, - 0, /* exported statistics */ - 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ - 0, /* extra processes */ + 0, /* exported statistics */ + 0, /* exported MI functions */ + mod_pvs, /* exported pseudo-variables */ + 0, /* extra processes */ mod_init, /* module initialization function */ 0, 0, @@ -135,24 +144,32 @@ typedef struct jsonrpc_plain_reply { int rcode; /**< reply code */ str rtext; /**< reply reason text */ str rbody; /**< reply body */ -} jsonrpc_play_reply_t; +} jsonrpc_plain_reply_t; -static jsonrpc_play_reply_t _jsonrpc_play_reply; +static jsonrpc_plain_reply_t _jsonrpc_plain_reply; static void jsonrpc_set_plain_reply(int rcode, str *rtext, str *rbody, void (*free_fn)(void*)) { - if(_jsonrpc_play_reply.rbody.s) { - free_fn(_jsonrpc_play_reply.rbody.s); + if(_jsonrpc_plain_reply.rbody.s) { + free_fn(_jsonrpc_plain_reply.rbody.s); } - _jsonrpc_play_reply.rcode = rcode; - _jsonrpc_play_reply.rtext = *rtext; + _jsonrpc_plain_reply.rcode = rcode; + _jsonrpc_plain_reply.rtext = *rtext; if(rbody) { - _jsonrpc_play_reply.rbody = *rbody; + _jsonrpc_plain_reply.rbody = *rbody; } else { - _jsonrpc_play_reply.rbody.s = NULL; - _jsonrpc_play_reply.rbody.len = 0; + _jsonrpc_plain_reply.rbody.s = NULL; + _jsonrpc_plain_reply.rbody.len = 0; + } +} + +static void jsonrpc_reset_plain_reply(void (*free_fn)(void*)) +{ + if(_jsonrpc_plain_reply.rbody.s) { + free_fn(_jsonrpc_plain_reply.rbody.s); } + memset(&_jsonrpc_plain_reply, 0, sizeof(jsonrpc_plain_reply_t)); } /** Implementation of rpc_fault function required by the management API. @@ -869,7 +886,7 @@ static int mod_init(void) jsonrpc_register_rpc(); - memset(&_jsonrpc_play_reply, 0, sizeof(jsonrpc_play_reply_t)); + memset(&_jsonrpc_plain_reply, 0, sizeof(jsonrpc_plain_reply_t)); return 0; } @@ -1090,3 +1107,48 @@ static int jsonrpc_register_rpc(void) } return 0; } + +/** + * + */ +static int jsonrpc_pv_get_jrpl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + switch(param->pvn.u.isname.name.n) + { + case 0: + return pv_get_uintval(msg, param, res, + (unsigned int)_jsonrpc_plain_reply.rcode); + case 1: + if(_jsonrpc_plain_reply.rtext.s==NULL) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &_jsonrpc_plain_reply.rtext); + case 2: + if(_jsonrpc_plain_reply.rbody.s==NULL) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &_jsonrpc_plain_reply.rbody); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +static int jsonrpc_pv_parse_jrpl_name(pv_spec_t *sp, str *in) +{ + if(in->len!=4) { + LM_ERR("unknown inner name [%.*s]\n", in->len, in->s); + return -1; + } + if(strncmp(in->s, "code", 4)==0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else if(strncmp(in->s, "text", 4)==0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else if(strncmp(in->s, "body", 4)==0) { + sp->pvp.pvn.u.isname.name.n = 2; + } else { + LM_ERR("unknown inner name [%.*s]\n", in->len, in->s); + return -1; + } + return 0; +}

1 0

git:master: jsonrpc-s: new fucntion jsonrpc_exec(cmd)
by Daniel-Constantin Mierla 09 Sep '14

09 Sep '14

Module: sip-router Branch: master Commit: 7bbe69bf6aa0798c674898aeb23b81249b177e34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bbe69b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 9 11:38:12 2014 +0200 jsonrpc-s: new fucntion jsonrpc_exec(cmd) - execute the jsonrpc command given as parameter - cmd has to be a full json rpc document - example: jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}') - the cmd can be a dynamic string with variables --- modules/jsonrpc-s/jsonrpc-s_mod.c | 132 +++++++++++++++++++++++++++++++++++-- 1 files changed, 127 insertions(+), 5 deletions(-) diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index 7f35272..ebbf4c6 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -27,6 +27,7 @@ #include "../../ver.h" #include "../../trim.h" #include "../../sr_module.h" +#include "../../mod_fix.h" #include "../../nonsip_hooks.h" #include "../../modules/xhttp/api.h" @@ -62,6 +63,7 @@ static int jsonrpc_register_rpc(void); static int mod_init(void); static int child_init(int rank); static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2); +static int jsonrpc_exec(sip_msg_t* msg, char* cmd, char* s2); /** The context of the jsonrpc request being processed. @@ -85,7 +87,10 @@ static rpc_t func_param; char jsonrpc_error_buf[JSONRPC_ERROR_REASON_BUF_LEN]; static cmd_export_t cmds[] = { - {"jsonrpc_dispatch", (cmd_function)jsonrpc_dispatch, 0, 0, 0, REQUEST_ROUTE}, + {"jsonrpc_dispatch", (cmd_function)jsonrpc_dispatch, 0, 0, 0, + REQUEST_ROUTE}, + {"jsonrpc_exec", (cmd_function)jsonrpc_exec, 1, fixup_spve_null, 0, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -126,6 +131,30 @@ static jsonrpc_error_t _jsonrpc_error_table[] = { {0, { 0, 0 } } }; +typedef struct jsonrpc_plain_reply { + int rcode; /**< reply code */ + str rtext; /**< reply reason text */ + str rbody; /**< reply body */ +} jsonrpc_play_reply_t; + +static jsonrpc_play_reply_t _jsonrpc_play_reply; + +static void jsonrpc_set_plain_reply(int rcode, str *rtext, str *rbody, + void (*free_fn)(void*)) +{ + if(_jsonrpc_play_reply.rbody.s) { + free_fn(_jsonrpc_play_reply.rbody.s); + } + _jsonrpc_play_reply.rcode = rcode; + _jsonrpc_play_reply.rtext = *rtext; + if(rbody) { + _jsonrpc_play_reply.rbody = *rbody; + } else { + _jsonrpc_play_reply.rbody.s = NULL; + _jsonrpc_play_reply.rbody.len = 0; + } +} + /** Implementation of rpc_fault function required by the management API. * * This function will be called whenever a management function @@ -265,11 +294,21 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx) rbuf.len = strlen(rbuf.s); } if (rbuf.s!=NULL) { - xhttp_api.reply(ctx->msg, ctx->http_code, &ctx->http_text, - &JSONRPC_CONTENT_TYPE_HTML, &rbuf); + if(ctx->msg) { + xhttp_api.reply(ctx->msg, ctx->http_code, &ctx->http_text, + &JSONRPC_CONTENT_TYPE_HTML, &rbuf); + } else { + jsonrpc_set_plain_reply(ctx->http_code, &ctx->http_text, &rbuf, + ctx->jrpl->free_fn); + } } else { - xhttp_api.reply(ctx->msg, ctx->http_code, &ctx->http_text, - NULL, NULL); + if(ctx->msg) { + xhttp_api.reply(ctx->msg, ctx->http_code, &ctx->http_text, + NULL, NULL); + } else { + jsonrpc_set_plain_reply(ctx->http_code, &ctx->http_text, NULL, + ctx->jrpl->free_fn); + } } if (rbuf.s!=NULL) { ctx->jrpl->free_fn(rbuf.s); @@ -830,6 +869,7 @@ static int mod_init(void) jsonrpc_register_rpc(); + memset(&_jsonrpc_play_reply, 0, sizeof(jsonrpc_play_reply_t)); return 0; } @@ -922,6 +962,88 @@ send_reply: } +static int jsonrpc_exec(sip_msg_t* msg, char* cmd, char* s2) +{ + rpc_export_t* rpce; + jsonrpc_ctx_t* ctx; + int ret; + srjson_t *nj = NULL; + str val; + str scmd; + + if(fixup_get_svalue(msg, (gparam_t*)cmd, &scmd)<0 || scmd.len<=0) { + LM_ERR("cannot get the rpc command parameter\n"); + return -1; + } + + /* initialize jsonrpc context */ + ctx = &_jsonrpc_ctx; + memset(ctx, 0, sizeof(jsonrpc_ctx_t)); + ctx->msg = NULL; /* mark it not send a reply out */ + /* parse the jsonrpc request */ + ctx->jreq = srjson_NewDoc(NULL); + if(ctx->jreq==NULL) { + LM_ERR("Failed to init the json document\n"); + return -1; + } + + ctx->jreq->buf = scmd; + ctx->jreq->root = srjson_Parse(ctx->jreq, ctx->jreq->buf.s); + if(ctx->jreq->root == NULL) + { + LM_ERR("invalid json doc [[%.*s]]\n", + ctx->jreq->buf.len, ctx->jreq->buf.s); + return -1; + } + ret = -1; + if (jsonrpc_init_reply(ctx) < 0) goto send_reply; + + /* sanity checks on jsonrpc request */ + nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "jsonrpc"); + if(nj==NULL) { + LM_ERR("missing jsonrpc field in request\n"); + goto send_reply; + } + val.s = nj->valuestring; + val.len = strlen(val.s); + if(val.len!=3 || strncmp(val.s, "2.0", 3)!=0) { + LM_ERR("unsupported jsonrpc version [%.*s]\n", val.len, val.s); + goto send_reply; + } + /* run jsonrpc command */ + nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "method"); + if(nj==NULL) { + LM_ERR("missing jsonrpc method field in request\n"); + goto send_reply; + } + val.s = nj->valuestring; + val.len = strlen(val.s); + ctx->method = val.s; + rpce = find_rpc_export(ctx->method, 0); + if (!rpce || !rpce->function) { + LM_ERR("method callback not found [%.*s]\n", val.len, val.s); + jsonrpc_fault(ctx, 500, "Method Not Found"); + goto send_reply; + } + ctx->flags = rpce->flags; + nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "params"); + if(nj!=NULL && nj->type!=srjson_Array && nj->type!=srjson_Object) { + LM_ERR("params field is not an array or object\n"); + goto send_reply; + } + if(nj!=NULL) ctx->req_node = nj->child; + rpce->function(&func_param, ctx); + ret = 1; + +send_reply: + if (!ctx->reply_sent) { + ret = jsonrpc_send(ctx); + } + jsonrpc_clean_context(ctx); + if (ret < 0) return -1; + return 1; +} + /** * */

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014