sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

git:master:ed4a2bc4: siptrace: use safety macros to copy values building address buffers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ed4a2bc477ebaf60d2fa82a3993dd5a61b54d9d3 URL: https://github.com/kamailio/kamailio/commit/ed4a2bc477ebaf60d2fa82a3993dd5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-08T12:33:57+01:00 siptrace: use safety macros to copy values building address buffers --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ed4a2bc477ebaf60d2fa82a3993dd5a… Patch: https://github.com/kamailio/kamailio/commit/ed4a2bc477ebaf60d2fa82a3993dd5a… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 3fcda5846e..59d41551a8 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1377,6 +1377,44 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) return; } +#define st_bufcopy_uint(_dbuf, _dsize, _dp, _sival) do { \ + str _ls; \ + _ls.s = int2str(_sival, &_ls.len); \ + if(_ls.s == NULL || _dp + _ls.len >= _dbuf + _dsize) { \ + LM_ERR("conversion error or out of bound (%p:%d/%p:%d\n", \ + _dbuf, _dsize, _dp, _ls.len); \ + goto error; \ + } \ + memcpy(_dp, _ls.s, _ls.len); \ + _dp += _ls.len; \ + } while(0) + +#define st_bufcopy_ipaddr(_dbuf, _dsize, _dp, _sipaddr) do { \ + str _ls; \ + _ls.s = ip_addr2a(_sipaddr); \ + if(_ls.s == NULL) { \ + LM_ERR("conversion error\n"); \ + goto error; \ + } \ + _ls.len = strlen(_ls.s); \ + if(_dp + _ls.len >= _dbuf + _dsize) { \ + LM_ERR("out of bound (%p:%d/%p:%d\n", \ + _dbuf, _dsize, _dp, _ls.len); \ + goto error; \ + } \ + memcpy(_dp, _ls.s, _ls.len); \ + _dp += _ls.len; \ + } while(0) + +#define st_bufcopy_char(_dbuf, _dsize, _dp, _scval) do { \ + if(_dp + 1 >= _dbuf + _dsize) { \ + LM_ERR("out of bound (%p:%d/%p:1\n", _dbuf, _dsize, _dp); \ + goto error; \ + } \ + *_dp = _scval; \ + _dp += 1; \ + } while(0) + /** * */ @@ -1384,6 +1422,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) { sr_net_info_t *nd; siptrace_data_t sto; + char *cp; if(evp->data == 0) return -1; @@ -1398,16 +1437,22 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.body.len = nd->data.len; siptrace_copy_proto(nd->rcv->proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&nd->rcv->src_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(nd->rcv->src_port, NULL)); + cp = sto.fromip_buff + strlen(sto.fromip_buff); + st_bufcopy_ipaddr(sto.fromip_buff, SIPTRACE_IP_ADDR_MAX, cp, + &nd->rcv->src_ip); + st_bufcopy_char(sto.fromip_buff, SIPTRACE_IP_ADDR_MAX, cp, ':'); + st_bufcopy_uint(sto.fromip_buff, SIPTRACE_IP_ADDR_MAX, cp, + nd->rcv->src_port); sto.fromip.s = sto.fromip_buff; sto.fromip.len = strlen(sto.fromip_buff); siptrace_copy_proto(nd->rcv->proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&nd->rcv->dst_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, int2str(nd->rcv->dst_port, NULL)); + cp = sto.toip_buff + strlen(sto.fromip_buff); + st_bufcopy_ipaddr(sto.toip_buff, SIPTRACE_IP_ADDR_MAX, cp, + &nd->rcv->dst_ip); + st_bufcopy_char(sto.toip_buff, SIPTRACE_IP_ADDR_MAX, cp, ':'); + st_bufcopy_uint(sto.toip_buff, SIPTRACE_IP_ADDR_MAX, cp, + nd->rcv->dst_port); sto.toip.s = sto.toip_buff; sto.toip.len = strlen(sto.toip_buff); @@ -1415,6 +1460,9 @@ int siptrace_net_data_recv(sr_event_param_t *evp) trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); return 0; + +error: + return -1; } /**

6 years, 8 months

git:master:f9b98c64: siptrace: define max size for address buffers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f9b98c647d2de1c279d370a5fb5b49201c117d8a URL: https://github.com/kamailio/kamailio/commit/f9b98c647d2de1c279d370a5fb5b492… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-08T11:35:19+01:00 siptrace: define max size for address buffers - use struct types --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h --- Diff: https://github.com/kamailio/kamailio/commit/f9b98c647d2de1c279d370a5fb5b492… Patch: https://github.com/kamailio/kamailio/commit/f9b98c647d2de1c279d370a5fb5b492…

6 years, 8 months

git:master:697c19b0: core: typedefed struct onsend_info to onsend_info_t

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 697c19b016fb1b0f7678716f31462d3f54d60719 URL: https://github.com/kamailio/kamailio/commit/697c19b016fb1b0f7678716f31462d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-08T11:35:19+01:00 core: typedefed struct onsend_info to onsend_info_t --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/697c19b016fb1b0f7678716f31462d3… Patch: https://github.com/kamailio/kamailio/commit/697c19b016fb1b0f7678716f31462d3… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index 8360ff241d..a2e8f569fd 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -36,15 +36,15 @@ #include "sr_compat.h" #include "kemi.h" -struct onsend_info{ +typedef struct onsend_info{ union sockaddr_union* to; /* dest info */ struct socket_info* send_sock; /* local send socket */ char* buf; /* outgoing buffer */ int len; /* outgoing buffer len */ sip_msg_t *msg; /* original sip msg struct */ -}; +} onsend_info_t; -extern struct onsend_info* p_onsend; +extern onsend_info_t* p_onsend; #define get_onsend_info() (p_onsend) @@ -53,13 +53,13 @@ extern struct onsend_info* p_onsend; * returns: 0 drop the message, >= ok, <0 error (but forward the message) * it also migh change dst->send_flags! * WARNING: buf must be 0 terminated (to allow regex matches on it) */ -static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, +static inline int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, char* buf, int len) { - struct onsend_info onsnd_info = {0}; + onsend_info_t onsnd_info = {0}; int ret; - struct run_act_ctx ra_ctx; - struct run_act_ctx *bctx; + run_act_ctx_t ra_ctx; + run_act_ctx_t *bctx; int backup_route_type; snd_flags_t fwd_snd_flags_bak; snd_flags_t rpl_snd_flags_bak;

6 years, 8 months

git:master:a41db4b0: core: typedefed struct proxy_l to proxy_l_t

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a41db4b0f56eccb8fb12c3c8257fd677d6c62537 URL: https://github.com/kamailio/kamailio/commit/a41db4b0f56eccb8fb12c3c8257fd67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-08T11:35:19+01:00 core: typedefed struct proxy_l to proxy_l_t --- Modified: src/core/proxy.h --- Diff: https://github.com/kamailio/kamailio/commit/a41db4b0f56eccb8fb12c3c8257fd67… Patch: https://github.com/kamailio/kamailio/commit/a41db4b0f56eccb8fb12c3c8257fd67… --- diff --git a/src/core/proxy.h b/src/core/proxy.h index d6ed0f8308..c7f88c6ec1 100644 --- a/src/core/proxy.h +++ b/src/core/proxy.h @@ -33,7 +33,7 @@ #include "str.h" #include "config.h" -struct proxy_l{ +typedef struct proxy_l{ struct proxy_l* next; str name; /* original name */ struct hostent host; /* addresses */ @@ -49,7 +49,7 @@ struct proxy_l{ int tx; int tx_bytes; int errors; -}; +} proxy_l_t; extern struct proxy_l* proxies; @@ -90,5 +90,4 @@ inline static void proxy_mark(struct proxy_l* p, int err) } -#endif - +#endif \ No newline at end of file

6 years, 8 months

OT: question about codetriage

by Daniel-Constantin Mierla

Hello, anyone here familiar with codetriage service? We got a pull request to refer to it from Kamailio readme.md file: - https://github.com/kamailio/kamailio/pull/1389 The link is to: - https://www.codetriage.com/kamailio/kamailio Which I guess is created by the one who did the pull request. The pull request comments has few references to other projects, including Rails, but as I am not familiar with the service, I thought of asking here and see if others had to deal with and what's the experience. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 5-7, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

6 years, 8 months

Kamailio World 2018 - Call for Presentations

by Daniel-Constantin Mierla

Hello, I would like to announce that Call for Presentations at Kamailio World 2018 is now open. You can submit your proposal or see more details at: - https://www.kamailioworld.com/k06/call-for-speakers/ The 6th edition of the event takes place again in Berlin, Germany, during May 14-16, 2018. Expect over 150 participants, developers and community members as well as representatives from other popular open source VoIP projects such as Asterisk or FreeSwitch. Looking forward to meeting many of you there! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

6 years, 8 months

git:master:26e09730: Merge pull request #1392 from que273/master

by GitHub

Module: kamailio Branch: master Commit: 26e09730ff8821313f1ee6a6f57669197e353148 URL: https://github.com/kamailio/kamailio/commit/26e09730ff8821313f1ee6a6f576691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-08T09:45:17+01:00 Merge pull request #1392 from que273/master Minor improvements to RPM packaging --- Modified: pkg/kamailio/obs/kamailio.init Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/26e09730ff8821313f1ee6a6f576691… Patch: https://github.com/kamailio/kamailio/commit/26e09730ff8821313f1ee6a6f576691… --- diff --git a/pkg/kamailio/obs/kamailio.init b/pkg/kamailio/obs/kamailio.init index 2cdae7a87d..0d7823637a 100644 --- a/pkg/kamailio/obs/kamailio.init +++ b/pkg/kamailio/obs/kamailio.init @@ -36,7 +36,7 @@ RUN_KAMAILIO=no check_fork () { if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" $KAMCFG; then - echo "Not starting $DESC: fork=no specified in config file; run /etc/init.d/kamailio debug instead" + echo "Not starting $PROG: fork=no specified in config file; run /etc/init.d/kamailio debug instead" exit 1 fi } @@ -44,10 +44,10 @@ check_fork () check_kamailio_config () { # Check if kamailio configuration is valid before starting the server - out=$($KAM -c 2>&1 > /dev/null) + out=$($KAM -c $OPTIONS 2>&1 > /dev/null) retcode=$? if [ "$retcode" != '0' ]; then - echo "Not starting $DESC: invalid configuration file!" + echo "Not starting $PROG: invalid configuration file!" echo -e "\n$out\n" exit 1 fi @@ -69,7 +69,7 @@ start() { stop() { echo -n $"Stopping $PROG: " - killproc $KAM + killproc -p $PID_FILE RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $LOCK_FILE $PID_FILE @@ -81,7 +81,7 @@ if [ -f $DEFAULTS ]; then fi if [ "$RUN_KAMAILIO" != "yes" ]; then - echo "Kamailio not yet configured. Edit /etc/default/kamailio first." + echo "Kamailio not yet configured. Edit $DEFAULTS first." exit 0 fi @@ -108,7 +108,7 @@ if [ ! -d $HOMEDIR ]; then chown ${USER}:${GROUP} $HOMEDIR fi -OPTIONS="-P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" +OPTIONS="-f $KAMCFG -P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" # See how we were called. diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5c98924046..ba802c83ad 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1188,7 +1188,6 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc -%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1336,7 +1335,6 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so -%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -1553,6 +1551,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_diameter_server %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf @@ -1570,6 +1569,7 @@ fi %{_libdir}/kamailio/modules/ims_diameter_server.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so

6 years, 8 months

git:master:6a7ea3d4: pkg/kamailio/obs: Move ims_ocs module to ims RPM

by Hugh Waite

Module: kamailio Branch: master Commit: 6a7ea3d489175659cbfcca4088a8cd26b9352273 URL: https://github.com/kamailio/kamailio/commit/6a7ea3d489175659cbfcca4088a8cd2… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2018-01-04T21:16:08Z pkg/kamailio/obs: Move ims_ocs module to ims RPM This module has a dependancy on libkamailio_ims.so so it belongs within the IMS RPM. --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/6a7ea3d489175659cbfcca4088a8cd2… Patch: https://github.com/kamailio/kamailio/commit/6a7ea3d489175659cbfcca4088a8cd2… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5c98924046..ba802c83ad 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1188,7 +1188,6 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc -%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1336,7 +1335,6 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so -%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -1553,6 +1551,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_diameter_server %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf @@ -1570,6 +1569,7 @@ fi %{_libdir}/kamailio/modules/ims_diameter_server.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so

6 years, 8 months

git:master:f06cad16: pkg/kamailio/obs: Minor improvements to kamailio.init file

by Hugh Waite

Module: kamailio Branch: master Commit: f06cad16ddd38771f29bfba29161bfa3ec76354f URL: https://github.com/kamailio/kamailio/commit/f06cad16ddd38771f29bfba29161bfa… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2018-01-04T21:01:08Z pkg/kamailio/obs: Minor improvements to kamailio.init file Use $PROG instead of uninitialised $DESC Pass the .cfg file name as a parameter when starting and checking config Use the pidfile when stopping to allow parallel instances --- Modified: pkg/kamailio/obs/kamailio.init --- Diff: https://github.com/kamailio/kamailio/commit/f06cad16ddd38771f29bfba29161bfa… Patch: https://github.com/kamailio/kamailio/commit/f06cad16ddd38771f29bfba29161bfa… --- diff --git a/pkg/kamailio/obs/kamailio.init b/pkg/kamailio/obs/kamailio.init index 2cdae7a87d..0d7823637a 100644 --- a/pkg/kamailio/obs/kamailio.init +++ b/pkg/kamailio/obs/kamailio.init @@ -36,7 +36,7 @@ RUN_KAMAILIO=no check_fork () { if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" $KAMCFG; then - echo "Not starting $DESC: fork=no specified in config file; run /etc/init.d/kamailio debug instead" + echo "Not starting $PROG: fork=no specified in config file; run /etc/init.d/kamailio debug instead" exit 1 fi } @@ -44,10 +44,10 @@ check_fork () check_kamailio_config () { # Check if kamailio configuration is valid before starting the server - out=$($KAM -c 2>&1 > /dev/null) + out=$($KAM -c $OPTIONS 2>&1 > /dev/null) retcode=$? if [ "$retcode" != '0' ]; then - echo "Not starting $DESC: invalid configuration file!" + echo "Not starting $PROG: invalid configuration file!" echo -e "\n$out\n" exit 1 fi @@ -69,7 +69,7 @@ start() { stop() { echo -n $"Stopping $PROG: " - killproc $KAM + killproc -p $PID_FILE RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $LOCK_FILE $PID_FILE @@ -81,7 +81,7 @@ if [ -f $DEFAULTS ]; then fi if [ "$RUN_KAMAILIO" != "yes" ]; then - echo "Kamailio not yet configured. Edit /etc/default/kamailio first." + echo "Kamailio not yet configured. Edit $DEFAULTS first." exit 0 fi @@ -108,7 +108,7 @@ if [ ! -d $HOMEDIR ]; then chown ${USER}:${GROUP} $HOMEDIR fi -OPTIONS="-P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" +OPTIONS="-f $KAMCFG -P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" # See how we were called.

6 years, 8 months

[kamailio/kamailio] Minor improvements to RPM packaging (#1392)

by Hugh Waite

### Description kamailio.spec: Move the ims_ocs module into the ims RPM. It has a dependancy on libkamailio_ims.so kamailio.init: Pass the .cfg file as a parameter when starting or syntax checking. Use the pidfile to kill only the relevant instance. This makes it easier to reuse the same script when running multiple kamailio instances on the same server. Only the environment vars at the top need to be changed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1392 -- Commit Summary -- * pkg/kamailio/obs: Minor improvements to kamailio.init file * pkg/kamailio/obs: Move ims_ocs module to ims RPM -- File Changes -- M pkg/kamailio/obs/kamailio.init (12) M pkg/kamailio/obs/kamailio.spec (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1392.patch https://github.com/kamailio/kamailio/pull/1392.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/1392

6 years, 8 months

← Newer
1
...
28
29
30
31
32
33
34
...
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