- sr-dev - kamailio.org

git:master:e976054f: sqlite: module group creation
by Daniel-Constantin Mierla 03 Dec '21

03 Dec '21

Module: kamailio Branch: master Commit: e976054f71692b536f59a81347e8254886f08a69 URL: https://github.com/kamailio/kamailio/commit/e976054f71692b536f59a81347e8254… Author: JailBird <jailbird(a)fdf.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-03T13:02:06+01:00 sqlite: module group creation - Add sqlite as an option to Makefile.groups - Add sqlite to INSTALL documentation --- Modified: INSTALL Modified: src/Makefile.groups --- Diff: https://… [View More]github.com/kamailio/kamailio/commit/e976054f71692b536f59a81347e8254… Patch: https://github.com/kamailio/kamailio/commit/e976054f71692b536f59a81347e8254… --- diff --git a/INSTALL b/INSTALL index 63c03062f4..7982d1d380 100644 --- a/INSTALL +++ b/INSTALL @@ -102,6 +102,7 @@ Requirements: - python and devel headers for the Python module - jdk and gcj for Java module - the jansson library for the jansson module used for JSON document handling +- libsqlite3 if you need SQLite support (the db_sqlite module) Some modules have other requirements on third-party libraries. This is documented in the README for the specific module. @@ -120,6 +121,7 @@ OS Notes: - expat-1.95.8 (/usr/ports/textproc/expat2) for libexpat - libxml2-2.6.18 (/usr/ports/textproc/libxml2) for libxml2 - radiusclient-0.4.7 (/usr/ports/net/radiusclient) for libradiusclient-ng + - sqlite3-3.35.5 (/usr/ports/databases/sqlite3) for libsqlite3 NOTE: you'll need to add radiusclient_ng=4 to the gmake command line if you use the 0.4.* version. @@ -135,6 +137,7 @@ OS Notes: http://download.berlios.de/radiusclient-ng/radiusclient-ng-0.5.1.tar.gz (you need to download and install it, since there is no "official" openbsd port for it) for libradiusclient-ng + - sqlite3-3.35.5 (/usr/ports/databases/sqlite3) for libsqlite3 Compile example (all the modules and SIP server core in a tar.gz): gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa" @@ -145,6 +148,7 @@ OS Notes: - expat-1.95.8nb2 (/usr/pkgsrc/textproc/expat) for libexpat - libxml2-2.6.19 (/usr/pkgsrc/textproc/libxml2) for libxml2 - radiusclient-ng-0.5.1 (see OpenBSD) + - sqlite3-3.36.0 (/usr/pkgsrc/databases/sqlite3) for libsqlite Compile example (all the modules and SIP server in a tar.gz): gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa" @@ -172,6 +176,7 @@ OS Notes: - libexpat1-dev for libexpat - libxml2-dev for libxml2 - libradiusclient-ng-dev for libradiusclient + - libsqlite3-dev for libsqlite - other libraries are needed for some other modules, see README of the module you want to use Kamailio have APT deb repositories that allow you to @@ -258,8 +263,8 @@ Including groups of modules: - db - Modules in this group use databases and need a database driver to run. Included are drivers for the text mode db (dbtext) and for dumping - large amount of data to files (db_flatstore). See also the mysql or - postgres groups. + large amount of data to files (db_flatstore). See also the mysql, + postgres, or sqlite groups. - standard_dep - Modules in this group are considered a standard part of Kamailio (due to widespread usage) but they have dependencies that must be satisfied @@ -290,6 +295,7 @@ are grouped based on Debian packaging rules. For example: mysql - Include all the db modules dependent and the MySQL db driver postgres - Include all the db modules and the PostgreSQL db driver + sqlite - Include all the db modules and the SQLite db driver radius - Include all modules on radiusclient presence - Include all the presence modules diff --git a/src/Makefile.groups b/src/Makefile.groups index 62a585cafb..c388489a66 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -319,6 +319,10 @@ module_group_mysql=$(module_group_mysql_driver) $(module_group_db) module_group_postgres_driver=$(mod_list_postgres) module_group_postgres=$(module_group_postgres_driver) $(module_group_db) +# For sqlite +module_group_sqlite_driver=$(mod_list_sqlite) +module_group_sqlite=$(module_group_sqlite_driver) $(module_group_db) + # For radius module_group_radius=$(mod_list_radius) [View Less]

1 0

git:master:f01a00bf: pkg/kamailio/deb: Add bookworm support
by Victor Seva 03 Dec '21

03 Dec '21

Module: kamailio Branch: master Commit: f01a00bf86bbdd09e26ba08f0da8ec89172a5eb8 URL: https://github.com/kamailio/kamailio/commit/f01a00bf86bbdd09e26ba08f0da8ec8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-03T11:01:35+01:00 pkg/kamailio/deb: Add bookworm support --- Added: pkg/kamailio/deb/bookworm/changelog Added: pkg/kamailio/deb/bookworm/compat Added: pkg/kamailio/deb/bookworm/control … [View More]

1 0

[kamailio/kamailio] add dlg.stats_active parameter to filter dialogs that belongs to the server (Issue #2920)
by Victor Seva 01 Dec '21

01 Dec '21

### Description If two kamailio servers share the same dialog db table, on restart, they both load all dialogues info stored in db into memory and dlg.stats_alive returns the same amount of alive dialogues on both serves. ### Expected behavior I would expect that dlg.stats_alive would return just the dialogues info that belongs to the server ( socket_info is not empty ) ### Possible Solutions Introduce an optional parameter to the RPC command to filter just the dialogues that belongs to … [View More]

2 2

[kamailio/kamailio] Loose Route Problem with uac_reg_request_to()/uac_auth() in combination with topos/topos_redis (Issue #2961)
by Emil Kroymann 01 Dec '21

01 Dec '21

We use Kamailio 5.5.0 and topos/topos_redis as well as the uac module to register with sipconnect 1.1 based trunks. When we want to originate a call via such a trunk, we encounter the following problem with ACK routing. 200 OK sent by Trunk `U 217.10.68.150:5060 -> 172.31.16.103:5060 #7583 SIP/2.0 200 OK. Via: SIP/2.0/UDP 3.67.244.157:5060;branch=z9hG4bK496f.744a3c48b24be1ba5fdda68cf5fe3878.1. Record-Route: <sip:172.20.40.8;lr>. Record-Route: <sip:217.10.68.150;lr>. Call-ID: … [View More]

2 2

git:master:d6a34eee: core: reworked string-number conversion to catch out of limits values
by Daniel-Constantin Mierla 01 Dec '21

01 Dec '21

Module: kamailio Branch: master Commit: d6a34eee893a47450650ea29671e80dbffc03c8f URL: https://github.com/kamailio/kamailio/commit/d6a34eee893a47450650ea29671e80d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-01T09:34:28+01:00 core: reworked string-number conversion to catch out of limits values --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]d6a34eee893a47450650ea29671e80d… Patch: https://github.com/kamailio/kamailio/commit/d6a34eee893a47450650ea29671e80d… --- diff --git a/src/core/ut.h b/src/core/ut.h index 9b899a94e7..44bd0e75c7 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -627,37 +627,43 @@ static inline void strlower(str* _s) } } - -#define str2unval(_s, _r, _vmax) do { \ - int i; \ - if (_r == NULL) return -1; \ +#define str2unval(_s, _r, _vtype, _vmax) do { \ + _vtype limitmul; \ + int i, c, limitrst; \ + if((_s == NULL) || (_r == NULL) || (_s->len < 0) || (_s->s == NULL)) { \ + return -1; \ + } \ *_r = 0; \ - if (_s == NULL) return -1; \ - if (_s->len < 0) return -1; \ - if (_s->s == NULL) return -1; \ - for(i = 0; i < _s->len; i++) { \ - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ - if(*_r > _vmax/10) { \ - return -1; \ - } \ - *_r *= 10; \ - if(*_r > _vmax - (_s->s[i] - '0')) { \ - return -1; \ - } \ - *_r += _s->s[i] - '0'; \ - } else { \ + i = 0; \ + if (_s->s[0] == '+') { \ + i++; \ + } \ + limitmul = _vmax / 10; \ + limitrst = _vmax % 10; \ + for(; i < _s->len; i++) { \ + c = (unsigned char)_s->s[i]; \ + if (c < '0' || c > '9') { \ + return -1; \ + } \ + c -= '0'; \ + if (*_r > limitmul || (*_r == limitmul && c > limitrst)) { \ + *_r = _vmax; \ return -1; \ + } else { \ + *_r *= 10; \ + *_r += c; \ } \ } \ return 0; \ } while(0) + /* * Convert an str to unsigned long */ static inline int str2ulong(str* _s, unsigned long* _r) { - str2unval(_s, _r, ULONG_MAX); + str2unval(_s, _r, long, ULONG_MAX); } /* @@ -665,56 +671,69 @@ static inline int str2ulong(str* _s, unsigned long* _r) */ static inline int str2int(str* _s, unsigned int* _r) { - str2unval(_s, _r, UINT_MAX); + str2unval(_s, _r, int, UINT_MAX); } -#define str2snval(_s, _r, _vmin, _vmax) do { \ - int i; \ - int sign; \ - long long ll; \ - if (_s == NULL) return -1; \ - if (_r == NULL) return -1; \ - if (_s->len < 0) return -1; \ - if (_s->s == NULL) return -1; \ + +#define str2snval(_s, _r, _vtype, _vmin, _vmax) do { \ + _vtype limitmul; \ + int i, c, neg, limitrst; \ + if((_s == NULL) || (_r == NULL) || (_s->len < 0) || (_s->s == NULL)) { \ + return -1; \ + } \ *_r = 0; \ - sign = 1; \ + neg = 0; \ i = 0; \ if (_s->s[0] == '+') { \ i++; \ } else if (_s->s[0] == '-') { \ - sign = -1; \ + neg = 1; \ i++; \ } \ + limitmul = neg ? _vmin : _vmax; \ + limitrst = limitmul % 10; \ + limitmul /= 10; \ + if (neg) { \ + if (limitrst > 0) { \ + limitrst -= 10; \ + limitmul += 1; \ + } \ + limitrst = -limitrst; \ + } \ for(; i < _s->len; i++) { \ - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ - if(*_r > _vmax/10) { \ + c = (unsigned char)_s->s[i]; \ + if (c < '0' || c > '9') { \ + return -1; \ + } \ + c -= '0'; \ + if (neg) { \ + if (*_r < limitmul || (*_r == limitmul && c > limitrst)) { \ + *_r = _vmin; \ return -1; \ + } else { \ + *_r *= 10; \ + *_r -= c; \ } \ - *_r *= 10; \ - if(*_r > _vmax - (_s->s[i] - '0')) { \ + } else { \ + if (*_r > limitmul || (*_r == limitmul && c > limitrst)) { \ + *_r = _vmax; \ return -1; \ + } else { \ + *_r *= 10; \ + *_r += c; \ } \ - *_r += _s->s[i] - '0'; \ - } else { \ - return -1; \ } \ } \ - if(sign < 0) { \ - ll = (long long)(*_r) * sign; \ - if(ll < _vmin) { \ - return -1; \ - } \ - *_r *= sign; \ - } \ return 0; \ } while(0) + /* * Convert an str to signed long */ static inline int str2slong(str* _s, long* _r) { - str2snval(_s, _r, LONG_MIN, LONG_MAX); + str2snval(_s, _r, long, LONG_MIN, LONG_MAX); } @@ -723,7 +742,7 @@ static inline int str2slong(str* _s, long* _r) */ static inline int str2sint(str* _s, int* _r) { - str2snval(_s, _r, INT_MIN, INT_MAX); + str2snval(_s, _r, int, INT_MIN, INT_MAX); } [View Less]

1 0

[kamailio/kamailio] sipt: added one function and 8 pseudo-variables (#2841)
by MikhailKalashnikov 30 Nov '21

30 Nov '21

- sipt_has_isup_body() - $sipt(redirection_information.reason) - $sipt(redirection_information.original_reason) - $sipt(redirecting_number.nai) - $sipt(redirecting_number) - $sipt(original_called_number.nai) - $sipt(original_called_number) - $sipt(generic_number.nai) - $sipt(generic_number)   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2841 -- Commit Summary -- * sipt: added one function and 8 pseudo-variables -- File Changes -- M src/modules/sipt/doc/sipt_admin.xml (95) M src/modules/sipt/sipt.c (358) M src/modules/sipt/ss7.h (14) M src/modules/sipt/ss7_parser.c (208) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2841.patch https://github.com/kamailio/kamailio/pull/2841.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/2841 [View Less]

4 20

git:master:94d1eecc: core: added #!defenvs preprocessor directive
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 94d1eecc618067bb04ed36deaf0ceee4e3bff06b URL: https://github.com/kamailio/kamailio/commit/94d1eecc618067bb04ed36deaf0ceee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T11:15:30+01:00 core: added #!defenvs preprocessor directive - similar to #!defenv, but the value is enclosed in double quotes to make it covenient to be used as a string token --- Modified: … [View More]src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/94d1eecc618067bb04ed36deaf0ceee… Patch: https://github.com/kamailio/kamailio/commit/94d1eecc618067bb04ed36deaf0ceee… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 06c87361a7..551cfab014 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -129,7 +129,7 @@ /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD DEFENV_ID +%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD DEFENV_ID DEFENVS_ID %x LINECOMMENT DEFINE_ID DEFINE_EOL DEFINE_DATA IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ @@ -565,6 +565,7 @@ ENDIF endif TRYDEF "trydefine"|"trydef" REDEF "redefine"|"redef" DEFENV defenv +DEFENVS defenvs /* else is already defined */ @@ -1449,7 +1450,28 @@ IMPORTFILE "import_file" <DEFENV_ID>[^ \t\r\n]+ { /* get the define id of environment variable */ count(); ksr_cfg_print_part(yytext); - if(pp_define_env(yytext, yyleng) < 0) { + if(pp_define_env(yytext, yyleng, KSR_PPDEF_NORMAL) < 0) { + LM_CRIT("error at %s line %d\n", (finame)?finame:"cfg", line); + ksr_exit(-1); + } + state = INITIAL; + ksr_cfg_print_initial_state(); +} + +<INITIAL,CFGPRINTMODE>{PREP_START}{DEFENVS} { count(); + ksr_cfg_print_part(yytext); + state = DEFINE_S; + BEGIN(DEFENVS_ID); +} + +<DEFENVS_ID>[ \t]* { /* eat the whitespace */ + count(); + ksr_cfg_print_part(yytext); + } +<DEFENVS_ID>[^ \t\r\n]+ { /* get the define id of environment variable */ + count(); + ksr_cfg_print_part(yytext); + if(pp_define_env(yytext, yyleng, KSR_PPDEF_QUOTED) < 0) { LM_CRIT("error at %s line %d\n", (finame)?finame:"cfg", line); ksr_exit(-1); } @@ -2060,7 +2082,7 @@ int pp_define_set(int len, char *text, int mode) return 0; } -int pp_define_env(const char *text, int len) +int pp_define_env(const char *text, int len, int qmode) { char *r; str defname; @@ -2093,7 +2115,7 @@ int pp_define_env(const char *text, int len) LM_ERR("cannot set define name [%s]\n", (char*)text); return -1; } - if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_NORMAL)<0) { + if(pp_define_set(defvalue.len, defvalue.s, qmode)<0) { LM_ERR("cannot set define value [%s]\n", (char*)text); return -1; } diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 17b19380bc..a8d27f7083 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -45,7 +45,7 @@ int pp_define(int len, const char *text); int pp_define_set(int len, char *text, int mode); int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); -int pp_define_env(const char * text, int len); +int pp_define_env(const char * text, int len, int qmode); void pp_ifdef_level_update(int val); int pp_ifdef_level_check(void); [View Less]

1 0

[kamailio/kamailio] db_redis: don't leave unconsumed redis replies in case of error (PR #2960)
by Andrew Pogrebennyk 30 Nov '21

30 Nov '21

- Execute db_redis_consume_replies on failed update same as in db_redis_insert: if db_redis_perform_update encounters an error it was leaving unconsumed data thus causing unexpected reply later on when reading from the same connection.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2960 -- Commit Summary -- * db_redis: don't leave unconsumed redis replies in case of error on update -- File Changes -- M src/modules/db_redis/redis_dbase.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2960.patch https://github.com/kamailio/kamailio/pull/2960.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/2960 [View Less]

3 2

git:master:e97ae3e6: Merge pull request #2960 from apogrebennyk/apogrebennyk/db_redis_update
by GitHub 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: e97ae3e621b2e7f28bd01069a9fbdd77ea16663f URL: https://github.com/kamailio/kamailio/commit/e97ae3e621b2e7f28bd01069a9fbdd7… Author: Andreas Granig <agranig(a)linguin.org> Committer: GitHub <noreply(a)github.com> Date: 2021-11-30T11:03:07+01:00 Merge pull request #2960 from apogrebennyk/apogrebennyk/db_redis_update db_redis: don't leave unconsumed redis replies in case of error --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: … [View More]

1 0

git:master:bbd7b2ed: db_redis: don't leave unconsumed redis replies in case of error on update
by Andrii Pogrebennyk 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: bbd7b2ed5827252680e9d8949c193699da0a76b2 URL: https://github.com/kamailio/kamailio/commit/bbd7b2ed5827252680e9d8949c19369… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Andrii Pogrebennyk <andrii(a)ng-voice.com> Date: 2021-11-28T08:34:36+01:00 db_redis: don't leave unconsumed redis replies in case of error on update Execute db_redis_consume_replies on failed update same as in db_redis_insert: if db_redis_perform_update … [View More]

1 0

[kamailio/kamailio] pv: extend $cnt to work with $xavp (PR #2940)
by Nicolas C 30 Nov '21

30 Nov '21

As suggested in previous PR (#2936). This is much more flexible as it can also handle sub XAVPs, and indexes. This ended up being more complicated than I anticipated, but I wanted to handle all possible cases. The tests I performed are detailled after, they should cover every possible use case. #### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] Tested changes locally #### Description Allows counting XAVPs with `$cnt($xavp(...))` … [View More]In addition to the `$cnt($avp(...))` - which is not modified. /* Usage: * * $cnt($xavp(key[*])) : number of XAVPs "key". * $cnt($xavp(key[n]=>sub[*])) : number of children "sub" in XAVP "key[n]". * $cnt($xavp(key[*]=>sub[*])) : total number of children "sub" in all XAVPs "key". * * $cnt($xavp(key[n])) : 1 or 0 (if this index exists or not). * $cnt($xavp(key[-n])) : same but with reverse indexing (-1 is the last index). * * $cnt($xavp(key[*]=>sub[n])) : number of children "sub[n]" that exist in all XAPVs "key". * * $cnt($xavp(key)) is the same as $cnt($xavp(key[*])). * $cnt($xavp(key=>sub)) is the same as $cnt($xavp(key[*]=>sub[*])). * * Note: Usually for a XAVP no index means "index 0", not all. * But this would be less intuitive in our case for counting. */ #### Tests I tried to be exhaustive. All the test cases below do work as expected. ``` $xavp(case1) = "case1.value1"; $xavp(case1) = "case1.value2"; $xavp(case1) = "case1.value3"; $xavp(case2=>sub1) = "case2.value1 sub1.value1"; $xavp(case2[0]=>sub1) = "case2.value1 sub1.value2"; $xavp(case2[0]=>sub1) = "case2.value1 sub1.value3"; $xavp(case2[0]=>sub2) = "case2.value1 sub2.value1"; $xavp(case2[0]=>sub2) = "case2.value1 sub2.value2"; # => will become case2[1] after adding the next entry $xavp(case2=>sub1) = "case2.value2 sub1.value1"; $xavp(case2[0]=>sub1) = "case2.value2 sub1.value2"; xlog("L_INFO", "----------- TESTS $$cnt($$xavp...) - root XAVPs with no sub XAVPs\n"); xlog("L_INFO", "xavp(case1[0]) : value = $xavp(case1[0]) : cnt (expect: 1) = $cnt($xavp(case1[0]))\n"); xlog("L_INFO", "xavp(case1[1]) : value = $xavp(case1[1]) : cnt (expect: 1) = $cnt($xavp(case1[1]))\n"); xlog("L_INFO", "xavp(case1[-1]) : value = $xavp(case1[-1]) : cnt (expect: 1) = $cnt($xavp(case1[-1]))\n"); xlog("L_INFO", "xavp(case1[-2]) : value = $xavp(case1[-2]) : cnt (expect: 1) = $cnt($xavp(case1[-2]))\n"); xlog("L_INFO", "xavp(case1[-66]) : value = $xavp(case1[-66]) : cnt (expect: 0) = $cnt($xavp(case1[-66]))\n"); xlog("L_INFO", "xavp(case1[66]) : value = $xavp(case1[66]) : cnt (expect: 0) = $cnt($xavp(case1[66]))\n"); xlog("L_INFO", "xavp(case1[*]) : cnt (expect: 3) = $cnt($xavp(case1[*]))\n"); xlog("L_INFO", "xavp(case1) : cnt (expect: 3) = $cnt($xavp(case1))\n"); xlog("L_INFO", "xavp(case1=>sub) : cnt (expect: 0) = $cnt($xavp(case1=>sub))\n"); xlog("L_INFO", "xavp(case1[0]=>sub) : cnt (expect: 0) = $cnt($xavp(case1[0]=>sub))\n"); xlog("L_INFO", "xavp(case1[0]=>sub[0]) : value = $xavp(case1[0]=>sub[0]) : cnt (expect: 0) = $cnt($xavp(case1[0]=>sub[0]))\n"); xlog("L_INFO", "----------- TESTS $$cnt($$xavp...) - root XAVPs using single index\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[0]) : value = $xavp(case2[1]=>sub1[0]) : cnt (expect: 1) = $cnt($xavp(case2[1]=>sub1[0]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[-1]) : value = $xavp(case2[1]=>sub1[-1]) : cnt (expect: 1) = $cnt($xavp(case2[1]=>sub1[-1]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[3]) : value = $xavp(case2[1]=>sub1[3]) : cnt (expect: 0) = $cnt($xavp(case2[1]=>sub1[3]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[*]) : cnt (expect: 3) = $cnt($xavp(case2[1]=>sub1[*]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1) : cnt (expect: 3) = $cnt($xavp(case2[1]=>sub1))\n"); xlog("L_INFO", "xavp(case2[1]=>sub2[*]) : cnt (expect: 2) = $cnt($xavp(case2[1]=>sub2[*]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub2) : cnt (expect: 2) = $cnt($xavp(case2[1]=>sub2))\n"); xlog("L_INFO", "xavp(case2[66]=>sub1) : cnt (expect: 0) = $cnt($xavp(case2[66]=>sub1))\n"); xlog("L_INFO", "xavp(case2[66]=>sub1[0]) : cnt (expect: 0) = $cnt($xavp(case2[66]=>sub1[0]))\n"); xlog("L_INFO", "----------- TESTS $$cnt($$xavp...) - root XAVPs using all index\n"); xlog("L_INFO", "xavp(case2=>sub1) : cnt (expect: 5) = $cnt($xavp(case2=>sub1))\n"); xlog("L_INFO", "xavp(case2=>sub1[*]) : cnt (expect: 5) = $cnt($xavp(case2=>sub1[*]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1) : cnt (expect: 5) = $cnt($xavp(case2[*]=>sub1))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[*]) : cnt (expect: 5) = $cnt($xavp(case2[*]=>sub1[*]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1) : cnt (expect: 5) = $cnt($xavp(case2[*]=>sub1))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[0]) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub1[0]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[2]) : cnt (expect: 1) = $cnt($xavp(case2[*]=>sub1[2]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[-1]) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub1[-1]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub2) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub2))\n"); xlog("L_INFO", "xavp(case2[*]=>sub2[*]) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub2[*]))\n"); #xlog("L_INFO", "----------- TESTS $$cnt(...) - parsing errors\n"); # parsing error => server fails to start #xlog("L_INFO", "PARSE ERROR: $cnt($xavu(test))\n"); #xlog("L_INFO", "PARSE ERROR: $cnt($var(test))\n"); #xlog("L_INFO", "PARSE ERROR: $cnt($unknown(test))\n"); ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2940 -- Commit Summary -- * pv: extend $cnt to work with $xavp -- File Changes -- M src/modules/pv/pv_core.c (156) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2940.patch https://github.com/kamailio/kamailio/pull/2940.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/2940 [View Less]

2 2

git:master:2af28f2e: pv: extend $cnt to work with $xavp
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 2af28f2e303b5eaa3738d045269fb94e8b059904 URL: https://github.com/kamailio/kamailio/commit/2af28f2e303b5eaa3738d045269fb94… Author: Nicolas C <nchaigne(a)capgemini.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T10:09:24+01:00 pv: extend $cnt to work with $xavp As suggested in previous PR (#2936). This is much more flexible as we also handle sub XAVPs and indexes. --- Modified: src/modules/pv/pv_core.c --- … [View More]

1 0

git:master:557952f0: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 557952f00bff4e9e70a41cad0be22c2f545f3c22 URL: https://github.com/kamailio/kamailio/commit/557952f00bff4e9e70a41cad0be22c2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-30T08:46:13+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:1ef34045: presence: docs - note the version for default behaviour change on 202 reply
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 1ef340457d0bddd8b15be2195c0a9d5d79f88d12 URL: https://github.com/kamailio/kamailio/commit/1ef340457d0bddd8b15be2195c0a9d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T08:33:34+01:00 presence: docs - note the version for default behaviour change on 202 reply --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:7a01a991: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 7a01a991b9012918130b131336a988a5f9fc4285 URL: https://github.com/kamailio/kamailio/commit/7a01a991b9012918130b131336a988a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-30T08:31:19+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] presence: return 200 instead of 202 by default (PR #2949)
by Laurențiu Nicola 30 Nov '21

30 Nov '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #2930 #### Description See https://github.com/kamailio/kamailio/pull/2930#issuecomment-971748854. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2949 -- Commit Summary -- * presence: return 200 instead of 202 by default -- File Changes -- M src/modules/presence/doc/presence_admin.xml (4) M src/modules/presence/presence.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2949.patch https://github.com/kamailio/kamailio/pull/2949.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/2949 [View Less]

2 2

git:master:22dd8c88: presence: return 200 instead of 202 by default
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 22dd8c88f854cb507b0af07ec8712ff3e74c510d URL: https://github.com/kamailio/kamailio/commit/22dd8c88f854cb507b0af07ec8712ff… Author: LaurenÈiu Nicola <lnicola(a)dend.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T08:25:18+01:00 presence: return 200 instead of 202 by default --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/presence.c --- Diff: https://github.com/… [View More]

1 0

[kamailio/kamailio] dispatcher: Not possible to deactivate probing of destination by reload (PR #2959)
by mtryfoss 30 Nov '21

30 Nov '21

If ds_probing_mode is set to 3, flag in the dispatcher entry needs to include 8 for probing to happen. Changing a destination to not include this anymore while the destination do not respond to OPTIONS will cause the probing flag to be re-added because of the delayed response. A restart will fix it. We need to check against the probing flag in the CB function to determine if we should continue probing this destination. If probing is deativated while waiting for a reply, we should abort. You … [View More]

2 2

git:master:429fea80: dispatcher: Not possible to deactivate probing of destination by reload
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 429fea8069f0753e6b8dbfbfaf36701e30af6dda URL: https://github.com/kamailio/kamailio/commit/429fea8069f0753e6b8dbfbfaf36701… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T08:24:03+01:00 dispatcher: Not possible to deactivate probing of destination by reload If ds_probing_mode is set to 3, flag in the dispatcher entry needs to include 8 for probing to happen. Changing a … [View More]

1 0

git:master:96a285db: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 96a285dbb193a7eb7b4080963bee69bce859abd8 URL: https://github.com/kamailio/kamailio/commit/96a285dbb193a7eb7b4080963bee69b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-29T17:46:20+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/96a285dbb193a7eb7b4080963bee69b… … [View More]

1 0

[kamailio/kamailio] Fix TM Module Doc unmatched_cancel param from string to integer (PR #2958)
by Zion Dials 29 Nov '21

29 Nov '21

Currently, the documentation states the unmatched_cancel parameter accepts a string input, but it only accepts an integer input. Fixing documentation to match the code's expectations. https://github.com/kamailio/kamailio/blob/b6cebaa76eaa4b98bbba6e271c50dbfa1… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2958 -- Commit Summary -- * Fix TM Module Doc unmatched_cancel param -- File Changes -- M src/modules/tm/doc/… [View More]

2 2

git:master:c060e900: Fix TM Module Doc unmatched_cancel param
by Henning Westerholt 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: c060e9000f9c6cca98e23bef7aa8c295c8863de6 URL: https://github.com/kamailio/kamailio/commit/c060e9000f9c6cca98e23bef7aa8c29… Author: Zion Dials <me(a)ziondials.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2021-11-29T17:44:21+01:00 Fix TM Module Doc unmatched_cancel param --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/c060e9000f9c6cca98e23bef7aa8c29… Patch: https://github.… [View More]

1 0

[kamailio/kamailio] asan: probable stack-buffer-overflow (Issue #2953)
by sergey-safarov 29 Nov '21

29 Nov '21

### Description Kamailio (744bc8f9e12b698cd6b8bc5ef63c84df7a3aea90) compiled with ASAN. During the start, I got the message ``` 0(52607) INFO: <core> [core/tcp_main.c:4997]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(52607) WARNING: <core> [core/daemonize.c:348]: daemonize(): pid file contains old pid, replacing pid 0(52607) INFO: cfgutils [cfgutils.c:869]: mod_init(): no hash_file given, disable hash functionality =======================================… [View More]========================== ==52607==ERROR: AddressSanitizer: stack-buffer-overflow on address 0xffffc6e64058 at pc 0x000000d02d10 bp 0xffffc6e63dc0 sp 0xffffc6e63de0 READ of size 4 at 0xffffc6e64058 thread T0 #0 0xd02d0f in fixup_get_param_type core/sr_module.c:1061 #1 0xd13a33 in fixup_var_pve_str_12 core/sr_module.c:1474 #2 0xffffa8ca8203 in redirect_init /usr/src/debug/kamailio-5.6.0-dev2.0.el8.centos.aarch64/src/modules/uac_redirect/uac_redirect.c:278 #3 0xd0021f (/usr/sbin/kamailio+0xd0021f) #4 0xcfefef (/usr/sbin/kamailio+0xcfefef) #5 0xcfefef (/usr/sbin/kamailio+0xcfefef) #6 0xcfefef (/usr/sbin/kamailio+0xcfefef) #7 0xcfefef (/usr/sbin/kamailio+0xcfefef) #8 0xcfefef (/usr/sbin/kamailio+0xcfefef) #9 0xcfefef (/usr/sbin/kamailio+0xcfefef) #10 0xcfefef (/usr/sbin/kamailio+0xcfefef) #11 0xcfefef (/usr/sbin/kamailio+0xcfefef) #12 0xcfefef (/usr/sbin/kamailio+0xcfefef) #13 0xcfefef (/usr/sbin/kamailio+0xcfefef) #14 0xcfefef (/usr/sbin/kamailio+0xcfefef) #15 0xcfefef (/usr/sbin/kamailio+0xcfefef) #16 0xcfefef (/usr/sbin/kamailio+0xcfefef) #17 0xcfefef (/usr/sbin/kamailio+0xcfefef) #18 0xcfefef (/usr/sbin/kamailio+0xcfefef) #19 0xcfefef (/usr/sbin/kamailio+0xcfefef) #20 0xcfefef (/usr/sbin/kamailio+0xcfefef) #21 0xcfefef (/usr/sbin/kamailio+0xcfefef) #22 0xcfefef (/usr/sbin/kamailio+0xcfefef) #23 0xcfefef (/usr/sbin/kamailio+0xcfefef) #24 0xcfefef (/usr/sbin/kamailio+0xcfefef) #25 0xcfefef (/usr/sbin/kamailio+0xcfefef) #26 0xcfefef (/usr/sbin/kamailio+0xcfefef) #27 0xcfefef (/usr/sbin/kamailio+0xcfefef) #28 0xcfefef (/usr/sbin/kamailio+0xcfefef) #29 0xcfefef (/usr/sbin/kamailio+0xcfefef) #30 0xcfefef (/usr/sbin/kamailio+0xcfefef) #31 0xcfefef (/usr/sbin/kamailio+0xcfefef) #32 0xcfefef (/usr/sbin/kamailio+0xcfefef) #33 0xcfefef (/usr/sbin/kamailio+0xcfefef) #34 0xcfefef (/usr/sbin/kamailio+0xcfefef) #35 0xd015ab in init_modules (/usr/sbin/kamailio+0xd015ab) #36 0x49fa6b in main (/usr/sbin/kamailio+0x49fa6b) #37 0xfffface10de3 in __libc_start_main (/lib64/libc.so.6+0x20de3) #38 0x4204eb (/usr/sbin/kamailio+0x4204eb) Address 0xffffc6e64058 is located in stack of thread T0 at offset 88 in frame #0 0xffffa8ca70e7 in redirect_init /usr/src/debug/kamailio-5.6.0-dev2.0.el8.centos.aarch64/src/modules/uac_redirect/uac_redirect.c:265 This frame has 8 object(s): [32, 40) 'filter' [96, 104) 'p' <== Memory access at offset 88 underflows this variable [160, 224) '__kld' [256, 320) '__kld' [352, 416) '__kld' [448, 512) '__kld' [544, 608) '__kld' [640, 704) '__kld' HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext (longjmp and C++ exceptions *are* supported) SUMMARY: AddressSanitizer: stack-buffer-overflow core/sr_module.c:1061 in fixup_get_param_type Shadow bytes around the buggy address: 0x200ff8dcc7b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x200ff8dcc7c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x200ff8dcc7d0: 00 00 00 00 00 00 00 00 f1 f1 f1 f1 00 00 00 00 0x200ff8dcc7e0: 00 00 00 00 f3 f3 f3 f3 00 00 00 00 00 00 00 00 0x200ff8dcc7f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 =>0x200ff8dcc800: f1 f1 f1 f1 00 f2 f2 f2 f2 f2 f2[f2]00 f2 f2 f2 0x200ff8dcc810: f2 f2 f2 f2 00 00 00 00 00 00 00 00 f2 f2 f2 f2 0x200ff8dcc820: 00 00 00 00 00 00 00 00 f2 f2 f2 f2 00 00 00 00 0x200ff8dcc830: 00 00 00 00 f2 f2 f2 f2 00 00 00 00 00 00 00 00 0x200ff8dcc840: f2 f2 f2 f2 00 00 00 00 00 00 00 00 f2 f2 f2 f2 0x200ff8dcc850: 00 00 00 00 00 00 00 00 f3 f3 f3 f3 00 00 00 00 Shadow byte legend (one shadow byte represents 8 application bytes): Addressable: 00 Partially addressable: 01 02 03 04 05 06 07 Heap left redzone: fa Freed heap region: fd Stack left redzone: f1 Stack mid redzone: f2 Stack right redzone: f3 Stack after return: f5 Stack use after scope: f8 Global redzone: f9 Global init order: f6 Poisoned by user: f7 Container overflow: fc Array cookie: ac Intra object redzone: bb ASan internal: fe Left alloca redzone: ca Right alloca redzone: cb ==52607==ABORTING ``` I do not know this is important or not. ASAN reports ``` HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext (longjmp and C++ exceptions *are* supported) ``` -- 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/issues/2953 [View Less]

2 2

[kamailio/kamailio] asan: shift exponent is too large for 32-bit type 'int' (Issue #2954)
by sergey-safarov 29 Nov '21

29 Nov '21

### Description Kamailio compiled with ASAN. During Kamailio start I see messages ``` core/flags.c:46:18: runtime error: shift exponent 4294967295 is too large for 32-bit type 'int' ``` and ``` nat_traversal.c:1293:27: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' ``` tested on current master -- 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/issues/2954

2 3

git:master:1a406e09: core: flags - use unsigned literal for bit shifting operations
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 1a406e093ea7ac07428c92aec21ac67f8caa1093 URL: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 core: flags - use unsigned literal for bit shifting operations --- Modified: src/core/flags.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]1a406e093ea7ac07428c92aec21ac67… Patch: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… --- diff --git a/src/core/flags.c b/src/core/flags.c index 551eefe2ee..207849c198 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -43,12 +43,12 @@ static flag_t sflags = 0; int setflag( struct sip_msg* msg, flag_t flag ) { - msg->flags |= 1 << flag; + msg->flags |= 1u << flag; return 1; } int resetflag( struct sip_msg* msg, flag_t flag ) { - msg->flags &= ~ (1 << flag); + msg->flags &= ~ (1u << flag); return 1; } @@ -58,7 +58,7 @@ int resetflags( struct sip_msg* msg, flag_t flags ) { } int isflagset( struct sip_msg* msg, flag_t flag ) { - return (msg->flags & (1<<flag)) ? 1 : -1; + return (msg->flags & (1u<<flag)) ? 1 : -1; } int flag_in_range( flag_t flag ) { @@ -79,21 +79,21 @@ int setsflagsval(flag_t val) int setsflag(flag_t flag) { - sflags |= 1 << flag; + sflags |= 1u << flag; return 1; } int resetsflag(flag_t flag) { - sflags &= ~ (1 << flag); + sflags &= ~ (1u << flag); return 1; } int issflagset(flag_t flag) { - return (sflags & (1<<flag)) ? 1 : -1; + return (sflags & (1u<<flag)) ? 1 : -1; } @@ -126,7 +126,7 @@ static unsigned char registered_flags[MAX_FLAG+1]; void init_named_flags() { int r; - + for (r=0; r<FLAGS_NAME_HASH_ENTRIES; r++) clist_init(&name2flags[r], next, prev); } @@ -149,7 +149,7 @@ inline static struct flag_entry* flag_search(struct flag_hash_head* lst, char* name, int len) { struct flag_entry* fe; - + clist_foreach(lst, fe, next){ if ((fe->name.len==len) && (memcmp(fe->name.s, name, len)==0)){ /* found */ @@ -176,7 +176,7 @@ inline static struct flag_entry* get_flag_entry(char* name, int len) int get_flag_no(char* name, int len) { struct flag_entry* fe; - + fe=get_flag_entry(name, len); return (fe)?fe->no:-1; } @@ -184,7 +184,7 @@ int get_flag_no(char* name, int len) /* resgiter a new flag name and associates it with pos - * pos== -1 => any position will do + * pos== -1 => any position will do * returns flag pos on success (>=0) * -1 flag is an alias for an already existing flag * -2 flag already registered @@ -199,7 +199,7 @@ int register_flag(char* name, int pos) static unsigned int crt_flag=0; unsigned int last_flag; unsigned int h; - + len=strlen(name); h=get_hash1_raw(name, len) & (FLAGS_NAME_HASH_ENTRIES-1); /* check if the name already exists */ @@ -235,7 +235,7 @@ int register_flag(char* name, int pos) } } registered_flags[pos]++; - + e=pkg_malloc(sizeof(struct flag_entry)); if (e==0){ PKG_MEM_ERROR; @@ -259,7 +259,7 @@ int setxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] |= 1 << fb; + msg->xflags[fi] |= 1u << fb; return 1; } @@ -272,7 +272,7 @@ int resetxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] &= ~ (1 << fb); + msg->xflags[fi] &= ~ (1u << fb); return 1; } @@ -285,5 +285,5 @@ int isxflagset(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; + return (msg->xflags[fi] & (1u<<fb)) ? 1 : -1; } [View Less]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev