sr-dev

sr-dev@lists.kamailio.org

18 participants
44295 discussions

[tracker] Task opened: Strange symbols in NOTIFY dialog-info+xml body (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Andrey 'Krieger' Utkin (andrey.utkin.2) Attached to Project - sip-router Summary - Strange symbols in NOTIFY dialog-info+xml body Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Happy New Year to all! I notice such things frequently in NOTIFYies generated by Kamailio from my PUBLISHes (injected by MI command). <code><dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="2" ll" entity="sip:1010@192.168.1.113"></code> This looks to be xml syntax violation, and i think it may be reason why my snom phone does not react to NOTIFY with desired BLF behaviour. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=25 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

15 years

git:master: We need to parse all headers here. Otherwise, the Record-Route-Headers may be incomplete.

by Carsten Bock

Module: sip-router Branch: master Commit: 9efc2f5f5195bbb8321e0e1a59d028e3c3358fb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9efc2f5… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Jan 6 16:38:56 2010 +0100 We need to parse all headers here. Otherwise, the Record-Route-Headers may be incomplete. --- modules_k/dialog/dlg_handlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 491a1f1..9b10614 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -226,7 +226,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri; /* extract the RR parts */ - if(!msg->record_route && (parse_headers(msg,HDR_RECORDROUTE_F,0)<0) ){ + if(!msg->record_route && (parse_headers(msg,HDR_EOH_F,0)<0) ){ LM_ERR("failed to parse record route header\n"); goto error0; }

15 years

git:master: According to the docs, stream2uac / stream2uas should accept a "-1" as a valid parameter, in order to repeat forever. With the old conversion, a value of "-1" would be considered invalid.

by Carsten Bock

Module: sip-router Branch: master Commit: 2cf0bb2cf1b98ea54c0085a48da27e0db0f9d522 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2cf0bb2… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Jan 6 16:38:04 2010 +0100 According to the docs, stream2uac / stream2uas should accept a "-1" as a valid parameter, in order to repeat forever. With the old conversion, a value of "-1" would be considered invalid. Credits go to Min Wang (wang(a)basis-audionet.com) for finding and fixing this. --- modules_k/nathelper/rtpproxy_stream.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules_k/nathelper/rtpproxy_stream.c b/modules_k/nathelper/rtpproxy_stream.c index 437cc5c..520bd2d 100644 --- a/modules_k/nathelper/rtpproxy_stream.c +++ b/modules_k/nathelper/rtpproxy_stream.c @@ -38,7 +38,6 @@ int fixup_var_str_int(void **param, int param_no) { - unsigned long go_to; int ret; pv_elem_t *model; str s; @@ -57,10 +56,14 @@ fixup_var_str_int(void **param, int param_no) } *param = (void *)model; } else if (param_no == 2) { - go_to = str2s(*param, strlen(*param), &ret); - if (ret == 0) { + /* According to + * http://www.kamailio.org/docs/modules/1.5.x/nathelper.html#rtpproxy_stream2x… + * this could be -1 */ + s.s = (char *)(*param); + s.len = strlen(s.s); + if (str2sint(&s, &ret)==0) { pkg_free(*param); - *param = (void *)go_to; + *param = (void *)ret; } else { LM_ERR("bad number <%s>\n", (char *)(*param)); return E_CFG;

15 years

SF.net SVN: openser:[5963] branches/1.5/modules/nathelper/rtpproxy_stream.c

by Carsten Bock

Revision: 5963 http://openser.svn.sourceforge.net/openser/?rev=5963&view=rev Author: carstenbock Date: 2010-01-06 15:34:00 +0000 (Wed, 06 Jan 2010) Log Message: ----------- According to the docs, stream2uac / stream2uas should accept a "-1" as a valid parameter, in order to repeat forever. With the old conversion, a value of "-1" would be cosidered invalid. Credits go to Min Wang (wang(a)basis-audionet.com) for finding and fixing this. Modified Paths: -------------- branches/1.5/modules/nathelper/rtpproxy_stream.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years

git:kamailio_3.0: tm: added t_relay_to(proxy, flags)

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: fc59de27f87772df40a4408485a34344acbec950 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc59de2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 6 14:36:55 2010 +0100 tm: added t_relay_to(proxy, flags) - parameters compatible with t_relay() in K old version - proxy value can be: [proto:]host[:port] - flgas can be 0x01, 0x04 or 0x05, 0x02 flag not supported - all or any of the parameters can be omitted --- modules/tm/tm.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index dcd9f83..a935755 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -146,6 +146,7 @@ static int fixup_on_reply(void** param, int param_no); static int fixup_on_branch(void** param, int param_no); static int fixup_t_reply(void** param, int param_no); static int fixup_on_sl_reply(modparam_t type, void* val); +static int fixup_t_relay_to(void** param, int param_no); /* init functions */ static int mod_init(void); @@ -181,6 +182,7 @@ inline static int w_t_relay_to_sctp( struct sip_msg *p_msg , char *proxy, inline static int w_t_relay_to_sctp_uri( struct sip_msg*, char*, char*); #endif inline static int w_t_relay_to_avp(struct sip_msg* msg, char* str,char*); +inline static int w_t_relay_to(struct sip_msg* msg, char* str,char*); inline static int w_t_replicate_uri( struct sip_msg *p_msg , char *uri, /* sip uri as string or variable */ char *_foo /* nothing expected */ ); @@ -319,6 +321,12 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE | FAILURE_ROUTE }, {"t_relay_to_avp", w_t_relay_to_avp, 2, fixup_proto_hostport2proxy, REQUEST_ROUTE}, + {"t_relay_to", w_t_relay_to, 0, 0, + REQUEST_ROUTE | FAILURE_ROUTE }, + {"t_relay_to", w_t_relay_to, 1, fixup_t_relay_to, + REQUEST_ROUTE | FAILURE_ROUTE }, + {"t_relay_to", w_t_relay_to, 2, fixup_t_relay_to, + REQUEST_ROUTE | FAILURE_ROUTE }, {T_FORWARD_NONACK, w_t_forward_nonack, 2, fixup_hostport2proxy, REQUEST_ROUTE}, {T_FORWARD_NONACK_URI, w_t_forward_nonack_uri, 0, 0, @@ -1880,3 +1888,163 @@ static int t_check_trans(struct sip_msg* msg, char* foo, char* bar) } return -1; } + +static int hexatoi(str *s, unsigned int* result) +{ + int i, xv, fact; + + /* more than 32bit hexa? */ + if (s->len>8) + return -1; + + *result = 0; + fact = 1; + + for(i=s->len-1; i>=0 ;i--) + { + xv = hex2int(s->s[i]); + if(xv<0) + return -1; + + *result += (xv * fact); + fact *= 16; + } + return 0; +} + +static int fixup_t_relay_to(void** param, int param_no) +{ + + int port; + int proto; + unsigned int flags; + struct proxy_l *proxy; + action_u_t *a; + str s; + str host; + + s.s = (char*)*param; + s.len = strlen(s.s); + LM_DBG("fixing (%s, %d)\n", s.s, param_no); + if (param_no==1){ + a = fixup_get_param(param, param_no, 2); + if(a==NULL) + { + LM_CRIT("server error for parameter <%s>\n",s.s); + return E_UNSPEC; + } + if(a->u.string!=NULL) { + /* second parameter set, first should be proxy addr */ + if (parse_phostport(s.s, &host.s, &host.len, &port, &proto)!=0){ + LM_CRIT("invalid proxy addr parameter <%s>\n",s.s); + return E_UNSPEC; + } + + proxy = mk_proxy(&host, port, proto); + if (proxy==0) { + LM_ERR("failed to build proxy structure for <%.*s>\n", host.len, host.s ); + return E_UNSPEC; + } + *(param)=proxy; + return 0; + } else { + /* no second parameter, then is proxy addr or flags */ + flags = 0; + if (s.len>2 && s.s[0]=='0' && s.s[1]=='x') { + s.s += 2; + s.len -= 2; + if(hexatoi(&s, &flags)<0) + { + LM_CRIT("invalid hexa flags <%s>\n", s.s); + return E_UNSPEC; + } + a->u.data = (void*)(unsigned long int)flags; + *(param)= 0; + return 0; + } else { + if(str2int(&s, &flags)==0) + { + a->u.data = (void*)(unsigned long int)flags; + *(param)= 0; + return 0; + } else { + /* try proxy */ + if (parse_phostport(s.s, &host.s, &host.len, &port, &proto)!=0){ + LM_CRIT("invalid proxy addr parameter <%s>\n",s.s); + return E_UNSPEC; + } + + proxy = mk_proxy(&host, port, proto); + if (proxy==0) { + LM_ERR("failed to build proxy structure for <%.*s>\n", host.len, host.s ); + return E_UNSPEC; + } + *(param)=proxy; + return 0; + } + } + } + } else if (param_no==2) { + /* flags */ + flags = 0; + if (s.len>2 && s.s[0]=='0' && s.s[1]=='x') { + s.s += 2; + s.len -= 2; + if(hexatoi(&s, &flags)<0) + { + LM_CRIT("invalid hexa flags <%s>\n", s.s); + return E_UNSPEC; + } + *(param) = (void*)(unsigned long int)flags; + return 0; + } else { + if(str2int(&s, &flags)==0) + { + *(param) = (void*)(unsigned long int)flags; + return 0; + } else { + LM_CRIT("invalid flags <%s>\n", s.s); + return E_UNSPEC; + } + } + } else { + LM_ERR("invalid parameter number %d\n", param_no); + return E_BUG; + } +} + + +inline static int w_t_relay_to(struct sip_msg *msg, char *proxy, char *flags) +{ + unsigned int fl; + struct proxy_l *px; + fparam_t param; + + fl = (unsigned int)(long)(void*)flags; + px = (struct proxy_l*)proxy; + + if(flags!=0) + { + memset(&param, 0, sizeof(fparam_t)); + param.type = FPARAM_INT; + /* no auto 100 trying */ + if(fl&1) { + param.v.i = 0; + t_set_auto_inv_100(msg, (char*)(&param), 0); + } + /* no auto negative reply - not implemented */ + /* + if(fl&2) { + param.v.i = 1; + t_set_disable_internal_reply(msg, (char*)param, 0); + } + */ + /* no dns failover */ + if(fl&4) { + param.v.i = 1; + t_set_disable_failover(msg, (char*)(&param), 0); + } + } + return _w_t_relay_to(msg, px, PROTO_NONE); +} +

15 years

git:kamailio_3.0: tm: documented t_relay_to() function

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: d8af3a4b17bf1ca71df1d977d986f407ff34cfc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8af3a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 6 15:39:46 2010 +0100 tm: documented t_relay_to() function --- modules/tm/README | 39 +++++++++++++++++++++- modules/tm/doc/functions.xml | 74 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 4 deletions(-) diff --git a/modules/tm/README b/modules/tm/README index 33125c8..a971836 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -104,6 +104,7 @@ Juha Heinanen 1.5.34. t_set_disable_6xx(0|1) 1.5.35. t_set_disable_failover(0|1) 1.5.36. t_replicate(params) + 1.5.37. t_relay_to(proxy, flags) 1.6. TM Module API @@ -2014,14 +2015,48 @@ route { # sent to 1.2.3.4:5060 over tcp t_replicate("sip:1.2.3.4:5060;transport=tcp"); -# sent to 1.2.3.4:5060 over tls -$var(h) = "1.2.3.4:5060"; +# sent to 1.2.3.4:5061 over tls +$var(h) = "1.2.3.4:5061"; t_replicate("sip:$var(h);transport=tls"); # sent to 1.2.3.4:5060 over udp t_replicate_to_udp("1.2.3.4", "5060"); ... +1.5.37. t_relay_to(proxy, flags) + + Forward the SIP request to a specific address, controlling internal + behavior via flags. + + There are several function prototypes: + * t_relay_to(), + * t_relay_to(proxy), + * t_relay_to(flags) + * t_relay_to(proxy, flags) + + Meaning of the parameters is as follows: + * proxy - address where the request should be sent. Format is: + "proto:host:port" - any of proto or port can be ommitted, along + with the semicolon after or before. + * flags - bitmask integer value to control the internal behavior. + Bits can be: + + 0x01 - do not generate 100 reply. + + 0x02 - do not generate reply on internal error (NOTE: has no + effect anymore). + + 0x04 - disable dns failover. + + Example 74. t_replicate usage +... +# sent to 1.2.3.4:5060 over tcp +t_relay_to("tcp:1.2.3.4:5060"); + +# sent to 1.2.3.4 over tls +t_relay_to("tls:1.2.3.4"); + +# sent to dst URI or R-URI without a 100 reply +t_relay_to("0x01"); +... + 1.6. TM Module API Revision History diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index dc2835d..dc4207c 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1387,8 +1387,8 @@ route { # sent to 1.2.3.4:5060 over tcp t_replicate("sip:1.2.3.4:5060;transport=tcp"); -# sent to 1.2.3.4:5060 over tls -$var(h) = "1.2.3.4:5060"; +# sent to 1.2.3.4:5061 over tls +$var(h) = "1.2.3.4:5061"; t_replicate("sip:$var(h);transport=tls"); # sent to 1.2.3.4:5060 over udp @@ -1397,5 +1397,75 @@ t_replicate_to_udp("1.2.3.4", "5060"); </programlisting> </example> </section> + <section id="t_relay_to"> + <title> + <function>t_relay_to(proxy, flags)</function> + </title> + <para> + Forward the SIP request to a specific address, controlling internal + behavior via flags. + </para> + <para> + There are several function prototypes: + <itemizedlist> + <listitem> + <function>t_relay_to()</function>, + </listitem> + <listitem> + <function>t_relay_to(proxy)</function>, + </listitem> + <listitem> + <function>t_relay_to(flags)</function> + </listitem> + <listitem> + <function>t_relay_to(proxy, flags)</function> + </listitem> + </itemizedlist> + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>proxy</emphasis> - address where the request should + be sent. Format is: "proto:host:port" - any of proto or port can be + ommitted, along with the semicolon after or before. + </para> + </listitem> + <listitem> + <para><emphasis>flags</emphasis> - bitmask integer value to control + the internal behavior. Bits can be: + </para> + <itemizedlist> + <listitem> + <para><emphasis>0x01</emphasis> - do not generate 100 reply. + </para> + </listitem> + <listitem> + <para><emphasis>0x02</emphasis> - do not generate reply on internal + error (NOTE: has no effect anymore). + </para> + </listitem> + <listitem> + <para><emphasis>0x04</emphasis> - disable dns failover. + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + <example> + <title><function>t_replicate</function> usage</title> + <programlisting> +... +# sent to 1.2.3.4:5060 over tcp +t_relay_to("tcp:1.2.3.4:5060"); + +# sent to 1.2.3.4 over tls +t_relay_to("tls:1.2.3.4"); + +# sent to dst URI or R-URI without a 100 reply +t_relay_to("0x01"); +... + </programlisting> + </example> + </section> </section>

15 years

git:kamailio_3.0: tm: documented t_replicate() functions

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a511ceccfb593736d44b7701fd07f3f9b5c3a104 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a511cec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 6 12:32:01 2010 +0100 tm: documented t_replicate() functions --- modules/tm/README | 114 +++++++++++++++++++++++++++-------------- modules/tm/doc/functions.xml | 76 ++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 39 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a51…

15 years

git:kamailio_3.0: tm: added t_replicate(uri)

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 64e19a6a44a21adf6f743420a26a48cc3acd099a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64e19a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 6 11:57:24 2010 +0100 tm: added t_replicate(uri) - the parameter has to be a valid SIP uri - it can be given via a script variable - K compatibility mode - reported by Santiago Gimeno --- modules/tm/tm.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 2774017..dcd9f83 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -114,6 +114,7 @@ #include "../../cfg/cfg.h" #include "../../globals.h" #include "../../timer_ticks.h" +#include "../../mod_fix.h" #include "config.h" #include "sip_msg.h" @@ -180,6 +181,9 @@ inline static int w_t_relay_to_sctp( struct sip_msg *p_msg , char *proxy, inline static int w_t_relay_to_sctp_uri( struct sip_msg*, char*, char*); #endif inline static int w_t_relay_to_avp(struct sip_msg* msg, char* str,char*); +inline static int w_t_replicate_uri( struct sip_msg *p_msg , + char *uri, /* sip uri as string or variable */ + char *_foo /* nothing expected */ ); inline static int w_t_replicate( struct sip_msg *p_msg , char *proxy, /* struct proxy_l *proxy expected */ char *_foo /* nothing expected */ ); @@ -289,6 +293,8 @@ static cmd_export_t cmds[]={ {T_RELAY_TO_SCTP, w_t_relay_to_sctp_uri, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE}, #endif + {"t_replicate", w_t_replicate_uri, 1, fixup_spve_null, + REQUEST_ROUTE}, {"t_replicate", w_t_replicate, 2, fixup_hostport2proxy, REQUEST_ROUTE}, {"t_replicate_udp", w_t_replicate_udp, 2, fixup_hostport2proxy, @@ -1365,6 +1371,39 @@ inline static int w_t_relay_to_avp( struct sip_msg *p_msg , return r; } +inline static int w_t_replicate_uri(struct sip_msg *msg , + char *uri, /* sip uri as string or variable */ + char *_foo /* nothing expected */ ) +{ + struct proxy_l *proxy; + struct sip_uri turi; + str suri; + int r = -1; + + memset(&turi, 0, sizeof(struct sip_uri)); + if(fixup_get_svalue(msg, (gparam_p)uri, &suri)!=0) + { + LM_ERR("invalid replicate uri parameter"); + return -1; + } + if(parse_uri(suri.s, suri.len, &turi)!=0) + { + LM_ERR("bad replicate SIP address!\n"); + return -1; + } + + proxy=mk_proxy(&turi.host, turi.port_no, turi.proto); + if (proxy==0) { + LM_ERR("cannot create proxy from URI <%.*s>\n", + suri.len, suri.s ); + return -1; + } + + r = t_replicate(msg, proxy, proxy->proto); + free_proxy(proxy); + return r; + +} inline static int w_t_replicate( struct sip_msg *p_msg , char *proxy, /* struct proxy_l *proxy expected */

15 years

git:kamailio_3.0: db_oracle: use PARAM_TYPE_MASK when checking param type

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: d1e89c65a9412d2a0560c5699a34dd01e231a2d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1e89c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 5 18:40:17 2010 +0100 db_oracle: use PARAM_TYPE_MASK when checking param type --- modules_k/db_oracle/asynch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/db_oracle/asynch.c b/modules_k/db_oracle/asynch.c index 173d572..bb92d35 100644 --- a/modules_k/db_oracle/asynch.c +++ b/modules_k/db_oracle/asynch.c @@ -66,7 +66,7 @@ static int set_tv(unsigned type, const char* val, struct timeval* tv) unsigned long s, ms; double dv; - if (type != STR_PARAM) { + if (PARAM_TYPE_MASK(type) != STR_PARAM) { LM_ERR("type of parameter is no STR\n"); return -1; }

15 years

git:kamailio_3.0: snmpstats: fix param type checking

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 9cf36478222aaf573a6cd7b65e6a4fd6227eb8cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cf3647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 5 18:27:46 2010 +0100 snmpstats: fix param type checking - parameter type is given from definition of params not from modparam value type, resulting in mismatches for parameters that have USE_FUNC_PARAM flag set - reported by Santiago Gimeno --- modules_k/snmpstats/snmpObjects.c | 2 +- modules_k/snmpstats/utilities.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/snmpstats/snmpObjects.c b/modules_k/snmpstats/snmpObjects.c index b797317..b9b36af 100644 --- a/modules_k/snmpstats/snmpObjects.c +++ b/modules_k/snmpstats/snmpObjects.c @@ -611,7 +611,7 @@ static int set_if_valid_threshold(modparam_t type, void *val, char *varStr, return -1; } - if (type != INT_PARAM) { + if (PARAM_TYPE_MASK(type) != INT_PARAM) { LM_ERR("%s called with type %d instead of %d!\n", varStr, type, INT_PARAM); return -1; diff --git a/modules_k/snmpstats/utilities.c b/modules_k/snmpstats/utilities.c index 2097f88..9b4011d 100644 --- a/modules_k/snmpstats/utilities.c +++ b/modules_k/snmpstats/utilities.c @@ -78,7 +78,7 @@ int stringHandlerSanityCheck( modparam_t type, void *val, char *parameterName) char *theString = (char *)val; /* Make sure the function was called correctly. */ - if (type != STR_PARAM) { + if (PARAM_TYPE_MASK(type) != STR_PARAM) { LM_ERR("the %s parameter was assigned a type %d instead of %d\n", parameterName, type, STR_PARAM); return 0;

15 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev