sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
270 discussions

git:master:3c905ec2: lrkproxy:some features add to lrkproxy module

by Mojtaba Esfandiari.S

Module: kamailio Branch: master Commit: 3c905ec289c2779b969f185021518f3532ce6833 URL: https://github.com/kamailio/kamailio/commit/3c905ec289c2779b969f185021518f3… Author: Mojtaba Esfandiari.S <mespio(a)gmail.com> Committer: Mojtaba Esfandiari.S <mespio(a)gmail.com> Date: 2021-12-04T00:41:51+03:30 lrkproxy:some features add to lrkproxy module add 'gt' option for optimization port resource allocation add 'custom_sdp_ip_avp' option for handling NAT client --- Modified: src/modules/lrkproxy/README Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml Modified: src/modules/lrkproxy/lrkproxy.c Modified: src/modules/lrkproxy/lrkproxy_funcs.c Modified: src/modules/lrkproxy/lrkproxy_funcs.h Modified: src/modules/lrkproxy/lrkproxy_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/3c905ec289c2779b969f185021518f3… Patch: https://github.com/kamailio/kamailio/commit/3c905ec289c2779b969f185021518f3…

2 years, 11 months

git:master:986b9bea: pkg/kamailio/deb: fix bookworm and sid build

by Victor Seva

Module: kamailio Branch: master Commit: 986b9bea258864bf40606afe9761dc17dead6476 URL: https://github.com/kamailio/kamailio/commit/986b9bea258864bf40606afe9761dc1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-04T17:01:55+01:00 pkg/kamailio/deb: fix bookworm and sid build * no python2 and dh-systemd package available --- Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/debian/backports/bookworm Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules --- Diff: https://github.com/kamailio/kamailio/commit/986b9bea258864bf40606afe9761dc1… Patch: https://github.com/kamailio/kamailio/commit/986b9bea258864bf40606afe9761dc1…

2 years, 11 months

DMQ + Presence issue (Notify generated by both server)

by Hardik Patel

Hello Team, We are using Kamailio 5.4.7 (DMQ + Presence) modules. We want to replicate all subscribe from server-1(Presence) to server-2(Presence).Replication worked perfectly fine but we noticed that after replicate the subscribe event both the presence server are generating the NOTIFY which should not. Can you please guide us where we made the mistake or how we can just replicate the subscribe information to other server using DMQ module? Please find the configuration SERVER-1 (Presence) ======================== ### presence_dialoginfo params ### modparam("presence_dialoginfo", "force_single_dialog", 1) ######## presence params ######### modparam("presence", "db_table_lock_type", 0) modparam("presence", "db_url", DBURL_LOCAL) modparam("presence", "db_update_period", 30) modparam("presence", "send_fast_notify", 1) modparam("presence", "clean_period", 100) modparam("presence", "subs_db_mode", 3) modparam("presence", "timeout_rm_subs", 0) //new/ modparam("presence", "notifier_poll_rate", 20) //new// modparam("presence", "waitn_time",1) modparam("presence", "fetch_rows", 1000) modparam("presence", "presentity_table", "presentity") modparam("presence", "active_watchers_table", "active_watchers") modparam("presence", "watchers_table", "watchers") modparam("presence", "max_expires", 3600) modparam("presence", "server_address", "sip:presence@VAR_LOCAL_IP:SIP_PORT") modparam("presence", "notifier_processes", 0) modparam("presence", "publ_cache", 1) modparam("presence", "subs_htable_size", 15) modparam("presence", "pres_htable_size", 15) modparam("presence", "delete_same_subs", 1) modparam("presence", "timer_mode", 0) modparam("presence", "force_delete", 1) modparam("presence", "enable_dmq", 1) ######## presence_xml params ###### modparam("presence_xml", "db_url", DBURL_LOCAL) modparam("presence_xml", "force_active", 1) #modparam("presence_xml", "disable_presence",1) #--- dmq db param ---- modparam("dmq","server_address","sip:VAR_LOCAL_IP:SIP_PORT") modparam("dmq", "notification_address", DMQ_NOTIFY_ADDR1) modparam("dmq", "num_workers", 4) modparam("dmq", "multi_notify", 1) modparam("dmq", "ping_interval", 60) if(is_method("KDMQ")) { dmq_handle_message(); } route[HANDLE_PRESENCE] { if (! t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { if ($hdr(Event) == "message-summary") { if($hdr(P-Flags)=~"1") { remove_hf("Event"); append_hf("Event: dialog\r\n"); msg_apply_changes(); remove_hf("Content-Type"); append_hf("Content-Type: application/dialog-info+xml\r\n"); msg_apply_changes(); } } if((search_hf("To", "queue+", "a")) && is_present_hf("SIP-If-Match")){ remove_hf("SIP-If-Match"); msg_apply_changes(); } xlog("L_ERR","(xhttp:request) : HANDLE_PUBLISH_FUN \n"); handle_publish(); t_release(); } else if( is_method("SUBSCRIBE")) { handle_subscribe(); if(!dmq_is_from_node()) dmq_t_replicate(); t_release(); } exit; } SERVER-2 (Presence) ====================== ### presence_dialoginfo params ### modparam("presence_dialoginfo", "force_single_dialog", 1) ######## presence params ######### modparam("presence", "db_table_lock_type", 0) modparam("presence", "db_url", DBURL_LOCAL) modparam("presence", "db_update_period", 30) modparam("presence", "send_fast_notify", 1) modparam("presence", "clean_period", 100) modparam("presence", "subs_db_mode", 3) modparam("presence", "timeout_rm_subs", 0) //new/ modparam("presence", "notifier_poll_rate", 20) //new// modparam("presence", "waitn_time",1) modparam("presence", "fetch_rows", 1000) modparam("presence", "presentity_table", "presentity") modparam("presence", "active_watchers_table", "active_watchers") modparam("presence", "watchers_table", "watchers") modparam("presence", "max_expires", 3600) modparam("presence", "server_address", "sip:presence@VAR_LOCAL_IP:SIP_PORT") modparam("presence", "notifier_processes", 0) modparam("presence", "publ_cache", 1) modparam("presence", "subs_htable_size", 15) modparam("presence", "pres_htable_size", 15) modparam("presence", "delete_same_subs", 1) modparam("presence", "timer_mode", 0) modparam("presence", "force_delete", 1) modparam("presence", "enable_dmq", 1) ######## presence_xml params ###### modparam("presence_xml", "db_url", DBURL_LOCAL) modparam("presence_xml", "force_active", 1) #modparam("presence_xml", "disable_presence",1) #--- dmq db param ---- modparam("dmq","server_address","sip:VAR_LOCAL_IP:SIP_PORT") modparam("dmq", "notification_address", DMQ_NOTIFY_ADDR1) modparam("dmq", "num_workers", 4) modparam("dmq", "multi_notify", 1) modparam("dmq", "ping_interval", 60) if(is_method("KDMQ")) { dmq_handle_message(); } route[HANDLE_PRESENCE] { if (! t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { if ($hdr(Event) == "message-summary") { if($hdr(P-Flags)=~"1") { remove_hf("Event"); append_hf("Event: dialog\r\n"); msg_apply_changes(); remove_hf("Content-Type"); append_hf("Content-Type: application/dialog-info+xml\r\n"); msg_apply_changes(); } } if((search_hf("To", "queue+", "a")) && is_present_hf("SIP-If-Match")){ remove_hf("SIP-If-Match"); msg_apply_changes(); } xlog("L_ERR","(xhttp:request) : HANDLE_PUBLISH_FUN \n"); handle_publish(); t_release(); } else if( is_method("SUBSCRIBE")) { handle_subscribe(); if(!dmq_is_from_node()) dmq_t_replicate(); t_release(); } exit; } version: kamailio 5.4.7 (x86_64/linux) a19fe1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a19fe1 compiled on 00:05:09 Oct 21 2021 with gcc 8.3.0 -- Hardik Patel

2 years, 11 months

git:master:3e4e5958: tsilo: reworked checking ruri and contact parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3e4e59584f3e8a2fea1d9167eaf42eda8cc5653b URL: https://github.com/kamailio/kamailio/commit/3e4e59584f3e8a2fea1d9167eaf42ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-03T13:02:45+01:00 tsilo: reworked checking ruri and contact parameters - removed module name from log messages --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/3e4e59584f3e8a2fea1d9167eaf42ed… Patch: https://github.com/kamailio/kamailio/commit/3e4e59584f3e8a2fea1d9167eaf42ed…

2 years, 11 months

[kamailio/kamailio] sqlite: module group creation (PR #2952)

by jailbird777

- Add sqlite as an option to Makefile.groups - Add sqlite to INSTALL documentation - [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 - [X] 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 db_sqlite couldn't be enable previously using group_include=sqlite. This fixes that. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2952 -- Commit Summary -- * sqlite: module group creation -- File Changes -- M INSTALL (10) M src/Makefile.groups (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2952.patch https://github.com/kamailio/kamailio/pull/2952.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/2952

2 years, 11 months

git:master:e976054f: sqlite: module group creation

by Daniel-Constantin Mierla

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://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)

2 years, 11 months

git:master:f01a00bf: pkg/kamailio/deb: Add bookworm support

by Victor Seva

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 Added: pkg/kamailio/deb/bookworm/copyright Added: pkg/kamailio/deb/bookworm/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/bookworm/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio.README.Debian Added: pkg/kamailio/deb/bookworm/kamailio.default Added: pkg/kamailio/deb/bookworm/kamailio.examples Added: pkg/kamailio/deb/bookworm/kamailio.init Added: pkg/kamailio/deb/bookworm/kamailio.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio.postinst Added: pkg/kamailio/deb/bookworm/kamailio.service Added: pkg/kamailio/deb/bookworm/rules Added: pkg/kamailio/deb/bookworm/source.lintian-overrides Added: pkg/kamailio/deb/bookworm/source/format Added: pkg/kamailio/deb/bookworm/watch Added: pkg/kamailio/deb/debian/backports/bookworm --- Diff: https://github.com/kamailio/kamailio/commit/f01a00bf86bbdd09e26ba08f0da8ec8… Patch: https://github.com/kamailio/kamailio/commit/f01a00bf86bbdd09e26ba08f0da8ec8…

2 years, 11 months

[kamailio/kamailio] add dlg.stats_active parameter to filter dialogs that belongs to the server (Issue #2920)

by Victor Seva

### 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 the server -- 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/2920

2 years, 11 months

[kamailio/kamailio] Loose Route Problem with uac_reg_request_to()/uac_auth() in combination with topos/topos_redis (Issue #2961)

by Emil Kroymann

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: 7cd83e052202a97f4e28728276e0c758@35.157.121.101:5060. From: "01705441258" <sip:2908206t0@sipconnect.sipgate.de>;tag=as010d26b4. To: <sip:+493046996025@voip.sandbox.aaron.ai>;tag=221f5413-4c48-4f53-97e8-d96ea6413f26. CSeq: 102 INVITE. Allow: OPTIONS, SUBSCRIBE, NOTIFY, PUBLISH, INVITE, ACK, BYE, CANCEL, UPDATE, MESSAGE, REFER. Contact: <sip:217.10.77.61:5060>. Supported: replaces. Content-Type: application/sdp. Content-Length: 242. .. v=0. o=- 56188352 56188354 IN IP4 212.9.44.180. s=sGW. c=IN IP4 212.9.44.180. t=0 0. m=audio 27558 RTP/AVP 8 101. a=maxptime:150. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-16. a=sendrecv. a=rtcp:27559. a=ptime:20. ` ACK sent by Kamailio `ACK sip:217.10.68.150:5060 SIP/2.0. Via: SIP/2.0/UDP 3.67.244.157:5060;branch=z9hG4bK496f.af6a45e3907d2bea8ea65cc42f223fb2.0. Max-Forwards: 69. From: "01705441258" <sip:01705441258@35.157.121.101>;tag=as010d26b4. To: <sip:+493046996025@voip.sandbox.aaron.ai:5060>;tag=221f5413-4c48-4f53-97e8-d96ea6413f26. Call-ID: 7cd83e052202a97f4e28728276e0c758@35.157.121.101:5060. CSeq: 102 ACK. User-Agent: Asterisk PBX 13.38.1. Content-Length: 0. Route: <sip:217.10.68.150;lr>. Route: <sip:172.20.40.8;lr>. Contact: <sip:btpsh-61a6122b-a-1@3.67.244.157>. .. ` The ACK is not accepted by the trunk, because the R-URI does not contain the address fromt the 200 OK/Contact. 200 OK is then retransmitted by the trunk. [kamailio-uac-topos-bug-report.zip](https://github.com/kamailio/kamailio/fil… -- 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/2961

2 years, 11 months

git:master:d6a34eee: core: reworked string-number conversion to catch out of limits values

by Daniel-Constantin Mierla

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/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); }

2 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021