sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

[kamailio/kamailio] v5.0.4: nathelper: force_socket not being honoured (#1298)

by 00Asgaroth00

### Description The force_socket parameter is not always used when set. If I understand the module documentation correctly, when setting the force_socket parameter, then all nathelper udp traffic will be forced to use this socket definition. The issue here is a result of another issue first described [here](http://sip-router.1086192.n5.nabble.com/NatHelper-ignoring-force-sock… in 2015 but is still present in current stable kamailio v5.0.4. We have 3 registrars running in "memory only" mode, using dmq_usrloc to replicate registrations to the remaining two nodes. On the remaining two nodes there is no socket parameter set for the AOR, but nathelper still wants to ping these AOR's. It is on these two systems where this issue exhibits itself. I will open another ticket for this scenario and try to reference it here as they are related. Each registrar has two interfaces, one is our "admin" lan, the other is our "voice" lan. The default route is set on these hosts and is a gateway on our "admin" lan. See issue #1297 When the registrars that are replicated to receive the AOR, they attempt to ping the endpoint (ideally they should not ping them). nathelper seems to think that the best interface to send them over is the "admin" lan even though force_socket is defined. I would have expected that the message should have been sent via the socket defined in the "force_socket" parameter. ### Troubleshooting Module definitions registrar ``` modparam("registrar", "method_filtering", 1) modparam("registrar", "case_sensitive", 1) modparam("registrar", "append_branches", 0) modparam("registrar", "use_path", 1) modparam("registrar", "path_mode", 0) modparam("registrar", "path_use_received", 1) modparam("registrar", "path_check_local", 1) modparam("registrar", "max_contacts", 1) ``` usrloc ``` modparam("usrloc", "db_mode", 0) modparam("usrloc", "use_domain", 1) modparam("usrloc", "timer_interval", 60) modparam("usrloc", "timer_procs", 4) modparam("usrloc", "nat_bflag", 6) ``` nathelper ``` modparam("nathelper", "natping_interval", 20) modparam("nathelper", "natping_processes", 4) modparam("nathelper", "ping_nated_only", 0) modparam("nathelper", "sipping_from", "sip:keepalive@example.com") modparam("nathelper", "sipping_method", "OPTIONS") modparam("nathelper", "sipping_bflag", 6) modparam("nathelper", "force_socket", "10.7.0.189:5060") modparam("nathelper", "udpping_from_path", 1) ``` Kamailio is listening on the same socket that is defined for the "force_socket" parameter above ``` listen=udp:10.6.0.189:5060 listen=udp:10.7.0.189:5060 listen=tcp:10.6.0.189:80 ``` dmq ``` modparam("dmq", "server_address", DMQ_ADDRESS) modparam("dmq", "notification_address", DMQ_NOTIFY_ADDRESS) modparam("dmq", "multi_notify", 1) modparam("dmq", "num_workers", 4) ``` dmq_usrloc ``` modparam("dmq_usrloc", "enable", 1) ``` #### Reproduction Using the above settings register a user and once they are replicated to the registrar that did not service the request, the options pings on the nodes that were replicated to will exhibit this issue. Example AOR where the registration was serviced (options pings should come from this host, and do, and flow as expected) ``` { "jsonrpc": "2.0", "result": { "Domain": "location", "Size": 1024, "AoRs": [{ "Info": { "AoR": "example_user(a)example.com", "HashID": -1389656423, "Contacts": [{ "Contact": { "Address": "sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP", "Expires": 66, "Q": -1, "Call-ID": "wE-GD4GzkrtuDAJUBJf1Jg..", "CSeq": 58, "User-Agent": "Z 3.15.40006 rv2.8.20", "Received": "sip:212.2.172.228:39808", "Path": "<sip:10.7.0.186:5062;lr;received=sip:212.2.172.228:39808>", "State": "CS_NEW", "Flags": 0, "CFlags": 64, "Socket": "udp:10.7.0.190:5060", "Methods": -1, "Ruid": "uloc-2-59fa1f9d-714-17", "Instance": "[not set]", "Reg-Id": 0, "Last-Keepalive": 1509615136, "Last-Modified": 1509615136 } }] } } ], "Stats": { "Records": 1, "Max-Slots": 1 } }, "id": 4836 } ``` example AOR of the above registration on a registrar that was replicated to by dmq/dmq_usrloc, ideally these AOR's should not be pinged at all, but, currently they do, but, in this case, when they do get ping'd, they do not use the socket as defined in the "force_socket" parameter. ``` { "jsonrpc": "2.0", "result": { "Domain": "location", "Size": 1024, "AoRs": [{ "Info": { "AoR": "example_user(a)example.com", "HashID": -1389656423, "Contacts": [{ "Contact": { "Address": "sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP", "Expires": 69, "Q": -1, "Call-ID": "wE-GD4GzkrtuDAJUBJf1Jg..", "CSeq": 91, "User-Agent": "Z 3.15.40006 rv2.8.20", "Received": "sip:212.2.172.228:39808", "Path": "<sip:10.7.0.186:5062;lr;received=sip:212.2.172.228:39808>", "State": "CS_NEW", "Flags": 2, "CFlags": 64, "Socket": "[not set]", "Methods": -1, "Ruid": "uloc-2-59fa1f9d-714-17", "Instance": "[not set]", "Reg-Id": 0, "Last-Keepalive": 1509617664, "Last-Modified": 1509617664 } }] } } ], "Stats": { "Records": 1, "Max-Slots": 1 } }, "id": 4571 } ``` #### Log Messages There are no apparent error messages in the logs relating to this that I can see. #### SIP Traffic Here you can clearly see that the OPTIONS message is being sent over the "10.6.0.189" interface when the modules "force_socket" parameter is set to "10.7.0.189:5060" ``` U 2017/11/02 08:37:59.426608 10.6.0.189:5060 -> 10.7.0.186:5062 OPTIONS sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP SIP/2.0. Via: SIP/2.0/UDP 10.6.0.189:5060;branch=z9hG4bK8416926. Route: <sip:10.7.0.186:5062;lr;received=sip:212.2.172.228:39808>. From: sip:keepalive@example.com;tag=uloc-2-59fa1f9d-714-17-9968b2da-13812ff4. To: sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP. Call-ID: c0cec5f7-555ac383-68bb313(a)10.6.0.189. CSeq: 1 OPTIONS. Content-Length: 0. . U 2017/11/02 08:38:19.431937 10.6.0.189:5060 -> 10.7.0.186:5062 OPTIONS sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP SIP/2.0. Via: SIP/2.0/UDP 10.6.0.189:5060;branch=z9hG4bK8345318. Route: <sip:10.7.0.186:5062;lr;received=sip:212.2.172.228:39808>. From: sip:keepalive@example.com;tag=uloc-2-59fa1f9d-714-17-9968b2da-23812ff4. To: sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP. Call-ID: c0cec5f7-655ac383-a9bb313(a)10.6.0.189. CSeq: 1 OPTIONS. Content-Length: 0. . ``` ### Possible Solutions Unknown ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 10:57:22 Oct 26 2017 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS Linux release 7.4.1708 (Core) Linux localhost 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1298

6 years, 8 months

Re: [sr-dev] [kamailio/kamailio] kamctl: expose db root password variable used by kamdbctl.mysql in kamctlrc (3138051)

by Daniel-Constantin Mierla

The purpose was exactly this one, to make visible as configuration option something that was not only in the functional code, but useful in various situation. Of course, it is bash and any variable can be set via environment, but it seemed not right to dig in the code to find internal stuff and see how one can overwrite it -- better make it explicit in the config file (and I also aligned it to the naming pattern for the rest of db vars). It would be good from people/community to propose changes/enhancements when they need something and it is not a configuration option, otherwise a developer may not have an idea who is using some _hidden internal_ stuff. Not really like that given is shell, but this would sound like: **in a C code blaming that a dev did a rename of a variable because someone does a sed to replace the old one before compilation with something else**. Then I do not even remember when kamdbctl version was bumped, but was nothing like done periodically or on changes, but I agree could have been something good to do. -- 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/commit/313805136d22ed79d1c490075324703…

6 years, 8 months

Re: [sr-dev] [kamailio/kamailio] kamctl: expose db root password variable used by kamdbctl.mysql in kamctlrc (3138051)

by Josh Nankin

we have chef scripts that set PW and run kamdbctl create on instance start up. This broke our build. How is this documented? There is not even a bump in the kamdbctl version number? -- 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/commit/313805136d22ed79d1c490075324703…

6 years, 8 months

git:master:2bb33a88: pua: safety check on tuple_id len

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2bb33a88881eacb94e2af54d564cdffc00478cea URL: https://github.com/kamailio/kamailio/commit/2bb33a88881eacb94e2af54d564cdff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-10T12:52:27+01:00 pua: safety check on tuple_id len --- Modified: src/modules/pua/add_events.c --- Diff: https://github.com/kamailio/kamailio/commit/2bb33a88881eacb94e2af54d564cdff… Patch: https://github.com/kamailio/kamailio/commit/2bb33a88881eacb94e2af54d564cdff… --- diff --git a/src/modules/pua/add_events.c b/src/modules/pua/add_events.c index ce94d5a842..79d3aeaedb 100644 --- a/src/modules/pua/add_events.c +++ b/src/modules/pua/add_events.c @@ -183,6 +183,10 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa { if(tuple== NULL) { + if(strlen(tuple_id)>=50) { + LM_ERR("tuple id is too long: %s\n", tuple_id); + goto error; + } strcpy(buf, tuple_id); xmlFree(tuple_id); tuple_id= buf;

6 years, 8 months

git:master:49949603: core/parser: more strict parsing of sip uri host

by Juha Heinanen

Module: kamailio Branch: master Commit: 4994960324d5353222b3de08515bed07802ab7bc URL: https://github.com/kamailio/kamailio/commit/4994960324d5353222b3de08515bed0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2018-01-10T08:39:48+02:00 core/parser: more strict parsing of sip uri host --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/4994960324d5353222b3de08515bed0… Patch: https://github.com/kamailio/kamailio/commit/4994960324d5353222b3de08515bed0… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index af03b92f0d..dbf5a7f9f7 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -528,23 +528,23 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) } break; case URI_HOST: - switch(*p){ - case '[': - state=URI_HOST6_P; - break; - case ':': - case ';': - case '?': /* null host name ->invalid */ - case '&': - case '@': /*chars not allowed in hosts names */ + if(*p == '[') { + state = URI_HOST6_P; + } else { + if(isalnum(*p)) { + state = URI_HOST_P; + } else { goto error_bad_host; - default: - state=URI_HOST_P; + } } break; case URI_HOST_P: - switch(*p){ + switch(*p) { check_host_end; + default: + if(!isalnum(*p) && (*p != '.') && (*p != '-')) { + goto error_bad_host; + } } break; case URI_HOST6_END:

6 years, 8 months

P-Server Exiting whenever Registered one user (Jitsi SIP Client)

by Prasannakumar Merugu

Hello All, We are able to registered user and make calls with Kamailio-5.0.4 version but, When we are trying register with Kamailio-5.1 version P-Server is exiting, Jitsi client getting registered I mentioned the below P-server error logs. 4(5562) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31b6@0:0:0:0:0:0:0:0) 4(5562) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 4(5562) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 4(5562) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 4(5562) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 4(5562) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 5(5563) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31 b6@0:0:0:0:0:0:0:0) 5(5563) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 5(5563) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 5(5563) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 5(5563) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 5(5563) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 9(5567) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, afcbb763f0f93a0352c619b5c99ae6 70@0:0:0:0:0:0:0:0) 9(5567) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 9(5567) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BF1500007900000000; icid-generated-at=192.168.99.170 8(5566) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1 f3@0:0:0:0:0:0:0:0) 8(5566) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 8(5566) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BE1500007900000000; icid-generated-at=192.168.99.170 12(5570) ERROR: <script>: OPTIONS (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, e6aa5e89244dc5c9c8d3368914df87d8@0:0:0:0:0:0:0:0) 12(5570) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 12(5570) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101C21500007900000000; icid-generated-at=192.168.99.170 1(5559) ERROR: <script>: PUBLISH (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 2a295e80bfd808d48ee4e20e9cd93869@0:0:0:0:0:0:0:0) 1(5559) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 1(5559) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101B71500007900000000; icid-generated-at=192.168.99.170 11(5569) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.170:6060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1f3@0:0:0:0:0:0:0:0) 0(5556) ALERT: <core> [main.c:745]: handle_sigs(): child process 5621 exited by a signal 11 0(5556) ALERT: <core> [main.c:748]: handle_sigs(): core was generated 0(5556) INFO: <core> [main.c:771]: handle_sigs(): terminating due to SIGCHLD -- *Thanks,* *Prasannakumar Merugu9010028290*

6 years, 8 months

P-Server Exiting whenever Registered one user

by Prasannakumar Merugu

Hello All, We are able to registered user and make calls with Kamailio-5.0.4 version but, When we are trying register with Kamailio-5.0.5 version P-Server is exiting, Jitsi client getting registered I mentioned the below P-server error logs. 4(5562) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31b6@0:0:0:0:0:0:0:0) 4(5562) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 4(5562) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 4(5562) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 4(5562) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 4(5562) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 5(5563) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31b6@0:0:0:0:0:0:0:0) 5(5563) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 5(5563) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 5(5563) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 5(5563) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 5(5563) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 9(5567) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, afcbb763f0f93a0352c619b5c99ae670@0:0:0:0:0:0:0:0) 9(5567) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 9(5567) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BF1500007900000000; icid-generated-at=192.168.99.170 8(5566) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1f3@0:0:0:0:0:0:0:0) 8(5566) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 8(5566) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BE1500007900000000; icid-generated-at=192.168.99.170 12(5570) ERROR: <script>: OPTIONS (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, e6aa5e89244dc5c9c8d3368914df87d8@0:0:0:0:0:0:0:0) 12(5570) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 12(5570) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101C21500007900000000; icid-generated-at=192.168.99.170 1(5559) ERROR: <script>: PUBLISH (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 2a295e80bfd808d48ee4e20e9cd93869@0:0:0:0:0:0:0:0) 1(5559) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 1(5559) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101B71500007900000000; icid-generated-at=192.168.99.170 11(5569) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.170:6060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1f3@0:0:0:0:0:0:0:0) 0(5556) ALERT: <core> [main.c:745]: handle_sigs(): child process 5621 exited by a signal 11 0(5556) ALERT: <core> [main.c:748]: handle_sigs(): core was generated 0(5556) INFO: <core> [main.c:771]: handle_sigs(): terminating due to SIGCHLD -- *Thanks,* *Prasannakumar Merugu9010028290*

6 years, 8 months

git:master:8f51d6b1: siptrace: retrieve and use the len of proto when building the address

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8f51d6b1624ebca08e71061e0c18c68101595201 URL: https://github.com/kamailio/kamailio/commit/8f51d6b1624ebca08e71061e0c18c68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-09T10:06:34+01:00 siptrace: retrieve and use the len of proto when building the address --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h --- Diff: https://github.com/kamailio/kamailio/commit/8f51d6b1624ebca08e71061e0c18c68… Patch: https://github.com/kamailio/kamailio/commit/8f51d6b1624ebca08e71061e0c18c68…

6 years, 8 months

git:master:aaf3b2e3: siptrace: siptrace_copy_proto() converted to macro

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aaf3b2e35bf58ad19b2b375f26909b102b7d512f URL: https://github.com/kamailio/kamailio/commit/aaf3b2e35bf58ad19b2b375f26909b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-09T10:00:31+01:00 siptrace: siptrace_copy_proto() converted to macro --- Modified: src/modules/siptrace/siptrace_send.c Modified: src/modules/siptrace/siptrace_send.h --- Diff: https://github.com/kamailio/kamailio/commit/aaf3b2e35bf58ad19b2b375f26909b1… Patch: https://github.com/kamailio/kamailio/commit/aaf3b2e35bf58ad19b2b375f26909b1… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 0a57d3b1f7..eeb91c20c7 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -41,29 +41,6 @@ extern int *xheaders_read_flag; extern str dup_uri_str; extern sip_uri_t *dup_uri; -/** - * - */ -int siptrace_copy_proto(int proto, char *buf) -{ - if(buf == 0) - return -1; - if(proto == PROTO_TCP) { - strcpy(buf, "tcp:"); - } else if(proto == PROTO_TLS) { - strcpy(buf, "tls:"); - } else if(proto == PROTO_SCTP) { - strcpy(buf, "sctp:"); - } else if(proto == PROTO_WS) { - strcpy(buf, "ws:"); - } else if(proto == PROTO_WSS) { - strcpy(buf, "wss:"); - } else { - strcpy(buf, "udp:"); - } - return 0; -} - /** * */ diff --git a/src/modules/siptrace/siptrace_send.h b/src/modules/siptrace/siptrace_send.h index 288566b75a..a83eebad22 100644 --- a/src/modules/siptrace/siptrace_send.h +++ b/src/modules/siptrace/siptrace_send.h @@ -28,11 +28,46 @@ #include "../../core/ip_addr.h" #include "siptrace_data.h" -int siptrace_copy_proto(int proto, char *buf); int sip_trace_prepare(sip_msg_t *msg); int sip_trace_xheaders_write(struct _siptrace_data *sto); int sip_trace_xheaders_read(struct _siptrace_data *sto); int sip_trace_xheaders_free(struct _siptrace_data *sto); int trace_send_duplicate(char *buf, int len, struct dest_info *dst2); +/** + * + */ +#define siptrace_copy_proto_olen(vproto, vbuf, vlen) do { \ + switch(vproto) { \ + case PROTO_TCP: \ + strcpy(vbuf, "tcp:"); \ + vlen = 4; \ + break; \ + case PROTO_TLS: \ + strcpy(vbuf, "tls:"); \ + vlen = 4; \ + break; \ + case PROTO_SCTP: \ + strcpy(vbuf, "sctp:"); \ + vlen = 5; \ + break; \ + case PROTO_WS: \ + strcpy(vbuf, "ws:"); \ + vlen = 3; \ + break; \ + case PROTO_WSS: \ + strcpy(vbuf, "wss:"); \ + vlen = 4; \ + break; \ + default: \ + strcpy(vbuf, "udp:"); \ + vlen = 4; \ + } \ + } while(0) + +#define siptrace_copy_proto(vproto, vbuf) do { \ + int __olen; \ + siptrace_copy_proto_olen(vproto, vbuf, __olen); \ + } while(0) + #endif

6 years, 8 months

P-Server Exiting whenever Registered one user

by Prasannakumar Merugu

6 years, 8 months

← Newer
1
...
27
28
29
30
31
32
33
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018