sr-dev

sr-dev@lists.kamailio.org

16 participants
45400 discussions

git:master:788f81af: siptrace: simplified internal sip_trace() function using now formatted print
by Daniel-Constantin Mierla 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: 788f81af006f481b23606451d225a86b6b02aac8 URL: https://github.com/kamailio/kamailio/commit/788f81af006f481b23606451d225a86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-12T14:23:45+01:00 siptrace: simplified internal sip_trace() function using now formatted print --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/788f81af006f481b23606451d225a86… Patch: https://github.com/kamailio/kamailio/commit/788f81af006f481b23606451d225a86… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index aaed65b702..3636a0929e 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -879,24 +879,32 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, && strncmp(sto.dir, "out", 3) == 0) { sto.fromip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), + ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.fromip.s = sto.fromip_buff; + } } if(trace_local_ip.s && trace_local_ip.len > 0 && strncmp(sto.dir, "in", 2) == 0) { sto.toip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), ip_addr2a(&msg->rcv.dst_ip), + (int)msg->rcv.dst_port); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } } } else { sto.body.s = snd_inf->buf; @@ -905,18 +913,29 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, if(trace_local_ip.s && trace_local_ip.len > 0) { sto.fromip = trace_local_ip; } else { - strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, - snd_inf->send_sock->sock_str.len); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + if(snd_inf->send_sock->sock_str.len>=SIPTRACE_ADDR_MAX-1) { + LM_WARN("local socket address is too large\n"); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, + snd_inf->send_sock->sock_str.len); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = snd_inf->send_sock->sock_str.len; + } } - siptrace_copy_proto(snd_inf->send_sock->proto, sto.toip_buff); - strcat(sto.toip_buff, suip2a(snd_inf->to, sizeof(*snd_inf->to))); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, int2str((int)su_getport(snd_inf->to), NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(snd_inf->send_sock->proto), + suip2a(snd_inf->to, sizeof(*snd_inf->to)), + (int)su_getport(snd_inf->to)); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } sto.dir = "out"; }

1 0

git:master:bc88adfd: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: bc88adfd52651a20a44e90c6d07fe641b6d3be39 URL: https://github.com/kamailio/kamailio/commit/bc88adfd52651a20a44e90c6d07fe64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-12T13:01:41+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/bc88adfd52651a20a44e90c6d07fe64… Patch: https://github.com/kamailio/kamailio/commit/bc88adfd52651a20a44e90c6d07fe64…

1 0

git:master:cb6df953: rtpengine: adding aggressive_redetection param
by Lucian Balaceanu 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: cb6df95387186fab8670d17cfd8040de1b7f641e URL: https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040d… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2018-01-12T13:36:34+02:00 rtpengine: adding aggressive_redetection param --- Modified: src/modules/rtpengine/config.c Modified: src/modules/rtpengine/config.h Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040d… Patch: https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040d… --- diff --git a/src/modules/rtpengine/config.c b/src/modules/rtpengine/config.c index f2aa4efc0a..946df8a30c 100644 --- a/src/modules/rtpengine/config.c +++ b/src/modules/rtpengine/config.c @@ -32,6 +32,7 @@ struct cfg_group_rtpengine default_rtpengine_cfg = { 60, /* default disable timeout in seconds */ + 1, /* default aggressive_redetection enabled */ 1000, /* default wait timeout in milliseconds */ MAX_RTPP_TRIED_NODES, 5, /* rtprengine retries */ @@ -42,6 +43,8 @@ void *rtpengine_cfg = &default_rtpengine_cfg; cfg_def_t rtpengine_cfg_def[] = { {"rtpengine_disable_tout", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "The time after which rtpengine will try to communicate to an RTP proxy after it has been marked disabled automatically. "}, + {"aggressive_redetection", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "Determines if the sip proxy should force a query of all nodes when all RTP proxies seem unavailable."}, {"rtpengine_tout_ms", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "The total number of nodes inside a set to be queried before giving up establishing a session"}, {"queried_nodes_limit", CFG_VAR_INT | CFG_ATOMIC, 0, MAX_RTPP_TRIED_NODES, 0, 0, diff --git a/src/modules/rtpengine/config.h b/src/modules/rtpengine/config.h index ab383bc69b..d6c35b71ac 100644 --- a/src/modules/rtpengine/config.h +++ b/src/modules/rtpengine/config.h @@ -28,6 +28,7 @@ struct cfg_group_rtpengine { unsigned int rtpengine_disable_tout; + unsigned int aggressive_redetection; unsigned int rtpengine_tout_ms; unsigned int queried_nodes_limit; unsigned int rtpengine_retr; diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 4133eb93c2..bc31168f63 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -194,6 +194,33 @@ modparam("rtpengine", "rtpengine_sock", ... modparam("rtpengine", "rtpengine_disable_tout", 20) ... +</programlisting> + </example> + </section> + <section id="rtpengine.p.aggressive_redetection"> + <title><varname>aggressive_redetection</varname> (integer)</title> + <para> + This parameter determines what happens when all potential rtpengines are found + to be unreachable. If enabled, the sip server will send pings to all rtpengines, + else no rtpengine will pe queried until its rtpengine_disable_tout timeout passes. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <para> + Can be set at runtime, e.g.: + <programlisting> + $ &sercmd; cfg.set_now_int rtpengine aggressive_redetection 0 + </programlisting> + </para> + <example> + <title>Set <varname>aggressive_redetection</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "aggressive_redetection", 0) +... </programlisting> </example> </section> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 5b82988229..6ad0c16d7e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -336,6 +336,7 @@ static param_export_t params[] = { {"rtpengine_sock", PARAM_STRING|USE_FUNC_PARAM, (void*)rtpengine_set_store }, {"rtpengine_disable_tout",INT_PARAM, &default_rtpengine_cfg.rtpengine_disable_tout }, + {"aggressive_redetection",INT_PARAM, &default_rtpengine_cfg.aggressive_redetection }, {"rtpengine_retr", INT_PARAM, &default_rtpengine_cfg.rtpengine_retr }, {"queried_nodes_limit", INT_PARAM, &default_rtpengine_cfg.queried_nodes_limit }, {"rtpengine_tout_ms", INT_PARAM, &default_rtpengine_cfg.rtpengine_tout_ms }, @@ -2610,6 +2611,10 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** /* No proxies? Force all to be redetected, if not yet */ if (weight_sum == 0) { + if (!cfg_get(rtpengine,rtpengine_cfg,aggressive_redetection)) { + return NULL; + } + if (was_forced) { return NULL; }

1 0

git:master:b3e14fc9: drouting: option to use a static structure for computing ac max val
by Daniel-Constantin Mierla 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: b3e14fc9bd379ad77c13ade0bc60dc32f1d55ade URL: https://github.com/kamailio/kamailio/commit/b3e14fc9bd379ad77c13ade0bc60dc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-12T09:50:36+01:00 drouting: option to use a static structure for computing ac max val --- Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h --- Diff: https://github.com/kamailio/kamailio/commit/b3e14fc9bd379ad77c13ade0bc60dc3… Patch: https://github.com/kamailio/kamailio/commit/b3e14fc9bd379ad77c13ade0bc60dc3… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 879665a07d..0af2e51326 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -203,17 +203,22 @@ int ac_tm_free(ac_tm_p _atp) return 0; } -ac_maxval_p ac_get_maxval(ac_tm_p _atp) +ac_maxval_p ac_get_maxval(ac_tm_p _atp, int mode) { struct tm _tm; int _v; ac_maxval_p _amp = NULL; + static ac_maxval_t _amv; if(!_atp) return NULL; - _amp = (ac_maxval_p)shm_malloc(sizeof(ac_maxval_t)); - if(!_amp) - return NULL; + if(mode==1) { + _amp = (ac_maxval_p)shm_malloc(sizeof(ac_maxval_t)); + if(!_amp) + return NULL; + } else { + _amp = &_amv; + } memset(_amp, 0, sizeof(ac_maxval_t)); /* the number of the days in the year */ @@ -270,11 +275,13 @@ ac_maxval_p ac_get_maxval(ac_tm_p _atp) + 1; #endif - if(_atp->mv!=NULL) { - shm_free(_atp->mv); - } + if(mode==1) { + if(_atp->mv!=NULL) { + shm_free(_atp->mv); + } - _atp->mv = _amp; + _atp->mv = _amp; + } return _amp; } @@ -1050,7 +1057,7 @@ int check_byxxx(tmrec_p _trp, ac_tm_p _atp) && !_trp->byweekno) return REC_MATCH; - _amp = ac_get_maxval(_atp); + _amp = ac_get_maxval(_atp, 0); if(!_amp) return REC_NOMATCH; diff --git a/src/modules/drouting/dr_time.h b/src/modules/drouting/dr_time.h index 86c041a646..67638e2358 100644 --- a/src/modules/drouting/dr_time.h +++ b/src/modules/drouting/dr_time.h @@ -76,7 +76,7 @@ int ac_tm_free(ac_tm_p); int ac_get_mweek(struct tm *); int ac_get_yweek(struct tm *); -ac_maxval_p ac_get_maxval(ac_tm_p); +ac_maxval_p ac_get_maxval(ac_tm_p, int); int ac_get_wkst(); int ac_print(ac_tm_p);

1 0

git:master:e0f95ea7: drouting: free max val for time recurrence struct on update if already set
by Daniel-Constantin Mierla 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: e0f95ea7fc691f976564b07436848673c633195d URL: https://github.com/kamailio/kamailio/commit/e0f95ea7fc691f976564b0743684867… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-11T12:16:47+01:00 drouting: free max val for time recurrence struct on update if already set - reported by Uri Shacked --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/e0f95ea7fc691f976564b0743684867… Patch: https://github.com/kamailio/kamailio/commit/e0f95ea7fc691f976564b0743684867… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 5482df7e7c..879665a07d 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -214,6 +214,7 @@ ac_maxval_p ac_get_maxval(ac_tm_p _atp) _amp = (ac_maxval_p)shm_malloc(sizeof(ac_maxval_t)); if(!_amp) return NULL; + memset(_amp, 0, sizeof(ac_maxval_t)); /* the number of the days in the year */ _amp->yday = 365 + is_leap_year(_atp->t.tm_year + 1900); @@ -269,6 +270,10 @@ ac_maxval_p ac_get_maxval(ac_tm_p _atp) + 1; #endif + if(_atp->mv!=NULL) { + shm_free(_atp->mv); + } + _atp->mv = _amp; return _amp; }

1 0

P-Server Exiting whenever Registered one user (Jitsi SIP Client)
by Prasannakumar Merugu 11 Jan '18

11 Jan '18

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*

2 1

git:master:2e460814: siptrace: replaced sequeces of string concatenations with safer formatted print
by Daniel-Constantin Mierla 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: 2e46081424240dfb3767da74b0818249dff46802 URL: https://github.com/kamailio/kamailio/commit/2e46081424240dfb3767da74b081824… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-11T11:53:35+01:00 siptrace: replaced sequeces of string concatenations with safer formatted print - used to build proxy-like addresses --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_send.c Modified: src/modules/siptrace/siptrace_send.h --- Diff: https://github.com/kamailio/kamailio/commit/2e46081424240dfb3767da74b081824… Patch: https://github.com/kamailio/kamailio/commit/2e46081424240dfb3767da74b081824… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 0df1e959fb..d8b5da399b 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1339,12 +1339,16 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) if(trace_local_ip.len > 0) { sto.fromip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&req->rcv.dst_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(req->rcv.dst_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(req->rcv.proto), + ip_addr2a(&req->rcv.dst_ip), req->rcv.dst_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = "any:255.255.255.255"; + sto.fromip.len = 19; + } else { + sto.fromip.s = sto.fromip_buff; + } } strcpy(statusbuf, int2str(slcbp->code, &sto.status.len)); @@ -1356,13 +1360,16 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) sto.toip.len = 19; } else { su2ip_addr(&to_ip, &slcbp->dst->to); - siptrace_copy_proto(req->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&to_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, - int2str((unsigned long)su_getport(&slcbp->dst->to), &len)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(req->rcv.proto), ip_addr2a(&to_ip), + (int)su_getport(&slcbp->dst->to)); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = "any:255.255.255.255"; + sto.toip.len = 19; + } else { + sto.toip.s = sto.toip_buff; + } } sto.dir = "out"; diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index eeb91c20c7..6e7718b933 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -318,3 +318,24 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) } return -1; } + +/** + * + */ +char* siptrace_proto_name(int vproto) +{ + switch(vproto) { + case PROTO_TCP: + return "tcp"; + case PROTO_TLS: + return "tls"; + case PROTO_SCTP: + return "sctp"; + case PROTO_WS: + return "ws"; + case PROTO_WSS: + return "wss"; + default: + return "udp"; + } +} diff --git a/src/modules/siptrace/siptrace_send.h b/src/modules/siptrace/siptrace_send.h index a83eebad22..30c33e53b5 100644 --- a/src/modules/siptrace/siptrace_send.h +++ b/src/modules/siptrace/siptrace_send.h @@ -70,4 +70,6 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2); siptrace_copy_proto_olen(vproto, vbuf, __olen); \ } while(0) -#endif +char* siptrace_proto_name(int vproto); + +#endif \ No newline at end of file

1 0

git:master:2ae4d19a: siptrace: use same value for "any" address
by Daniel-Constantin Mierla 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: 2ae4d19a5948d771980853bf38aeef8c1553faec URL: https://github.com/kamailio/kamailio/commit/2ae4d19a5948d771980853bf38aeef8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-11T11:53:35+01:00 siptrace: use same value for "any" address - two variants were used: any:255.255.255.255:5060 and any:255.255.255.255, now any:255.255.255.255:5060 is used everywhere through a define --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/2ae4d19a5948d771980853bf38aeef8… Patch: https://github.com/kamailio/kamailio/commit/2ae4d19a5948d771980853bf38aeef8… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index d8b5da399b..aaed65b702 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -59,6 +59,8 @@ MODULE_VERSION +#define SIPTRACE_ANYADDR "any:255.255.255.255:5060" +#define SIPTRACE_ANYADDR_LEN (sizeof(SIPTRACE_ANYADDR) - 1) struct tm_binds tmb; @@ -1084,8 +1086,8 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) } if(dst == 0) { - sto.toip.s = "any:255.255.255.255"; - sto.toip.len = 19; + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { su2ip_addr(&to_ip, &dst->to); siptrace_copy_proto(dst->proto, sto.toip_buff); @@ -1267,8 +1269,8 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) memset(&to_ip, 0, sizeof(struct ip_addr)); dst = ps->dst; if(dst == 0) { - sto.toip.s = "any:255.255.255.255"; - sto.toip.len = 19; + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { su2ip_addr(&to_ip, &dst->to); siptrace_copy_proto(dst->proto, sto.toip_buff); @@ -1344,8 +1346,8 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) ip_addr2a(&req->rcv.dst_ip), req->rcv.dst_port); if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); - sto.fromip.s = "any:255.255.255.255"; - sto.fromip.len = 19; + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; } else { sto.fromip.s = sto.fromip_buff; } @@ -1356,8 +1358,8 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) memset(&to_ip, 0, sizeof(struct ip_addr)); if(slcbp->dst == 0) { - sto.toip.s = "any:255.255.255.255"; - sto.toip.len = 19; + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { su2ip_addr(&to_ip, &slcbp->dst->to); sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", @@ -1365,8 +1367,8 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) (int)su_getport(&slcbp->dst->to)); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); - sto.toip.s = "any:255.255.255.255"; - sto.toip.len = 19; + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { sto.toip.s = sto.toip_buff; } @@ -1503,8 +1505,8 @@ int siptrace_net_data_send(sr_event_param_t *evp) if(unlikely(new_dst.send_sock == 0)) { LM_WARN("no sending socket found\n"); - strcpy(sto.fromip_buff, "any:255.255.255.255:5060"); - sto.fromip.len = 24; + strcpy(sto.fromip_buff, SIPTRACE_ANYADDR); + sto.fromip.len = SIPTRACE_ANYADDR_LEN; } else { if(new_dst.send_sock->sock_str.len>=SIPTRACE_ADDR_MAX-1) { LM_ERR("socket string is too large: %d\n",

1 0

git:master:74560dcd: Merge pull request #1394 from tverlaan/nathelper_fix_documentation
by GitHub 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: 74560dcd9bd4f7a00a9f82caded66f79a22940aa URL: https://github.com/kamailio/kamailio/commit/74560dcd9bd4f7a00a9f82caded66f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-11T11:25:51+01:00 Merge pull request #1394 from tverlaan/nathelper_fix_documentation nathelper: fix force_socket documentation --- Modified: src/modules/nathelper/README Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/74560dcd9bd4f7a00a9f82caded66f7… Patch: https://github.com/kamailio/kamailio/commit/74560dcd9bd4f7a00a9f82caded66f7… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 867e7aad88..55a1245053 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -249,14 +249,15 @@ Chapter 1. Admin Guide 4.1. force_socket (string) - Socket to be used when sending NAT pings for UDP communication. If no - one specified, the OS will choose a socket. + Socket to be used when sending NAT pings for UDP communication. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. Default value is “NULL”. Example 1.1. Set force_socket parameter ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... 4.2. natping_interval (integer) diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index c032fc3a84..feb5b5cbe4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,7 +128,8 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - If no one specified, the OS will choose a socket. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -139,7 +140,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... </programlisting> </example>

1 0

git:master:bfdb6ae6: nathelper: fix force_socket documentation
by Timmo Verlaan 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: bfdb6ae670464ca9ff5dbb2d4d9cf5a02afd36f6 URL: https://github.com/kamailio/kamailio/commit/bfdb6ae670464ca9ff5dbb2d4d9cf5a… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-10T16:30:04+01:00 nathelper: fix force_socket documentation --- Modified: src/modules/nathelper/README Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bfdb6ae670464ca9ff5dbb2d4d9cf5a… Patch: https://github.com/kamailio/kamailio/commit/bfdb6ae670464ca9ff5dbb2d4d9cf5a… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 867e7aad88..55a1245053 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -249,14 +249,15 @@ Chapter 1. Admin Guide 4.1. force_socket (string) - Socket to be used when sending NAT pings for UDP communication. If no - one specified, the OS will choose a socket. + Socket to be used when sending NAT pings for UDP communication. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. Default value is “NULL”. Example 1.1. Set force_socket parameter ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... 4.2. natping_interval (integer) diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index c032fc3a84..feb5b5cbe4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,7 +128,8 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - If no one specified, the OS will choose a socket. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -139,7 +140,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... </programlisting> </example>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev