sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

INFO: modules purple and iptrtpproxy moved to obsolete folder
by Daniel-Constantin Mierla 05 Dec '16

05 Dec '16

Hello, be aware that the modules purple and iptrtpproxy were moved to obsolete folder. They were not compiling for several years and nobody showed interest in updating them. If anyone wast to rescue them, she/he is welcome to get them back and upgrade the code to work with current versions of their dependencies. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

1 0

git:master:604d55e2: obsolete: moved modules purple and iptrtpproxy
by Daniel-Constantin Mierla 05 Dec '16

05 Dec '16

Module: kamailio Branch: master Commit: 604d55e2065514cabce0329e4fd0c1547d01873f URL: https://github.com/kamailio/kamailio/commit/604d55e2065514cabce0329e4fd0c15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-05T14:39:51+01:00 obsolete: moved modules purple and iptrtpproxy - they are no longer working, not being updated to use latest libs for a very long time --- Added: obsolete/iptrtpproxy/Makefile Added: obsolete/iptrtpproxy/README Added: obsolete/iptrtpproxy/doc/Makefile Added: obsolete/iptrtpproxy/doc/iptrtpproxy.xml Added: obsolete/iptrtpproxy/doc/iptrtpproxy_admin.xml Added: obsolete/iptrtpproxy/iptrtpproxy.c Added: obsolete/iptrtpproxy/oob/clean_rtpproxy_attrs Added: obsolete/iptrtpproxy/oob/rtpproxy_attrs.sql Added: obsolete/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.inc Added: obsolete/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.patch Added: obsolete/purple/LICENSE Added: obsolete/purple/Makefile Added: obsolete/purple/README Added: obsolete/purple/clientaccount.c Added: obsolete/purple/clientaccount.h Added: obsolete/purple/clientops.c Added: obsolete/purple/clientops.h Added: obsolete/purple/clientpipe.c Added: obsolete/purple/clientpipe.h Added: obsolete/purple/clientsig.c Added: obsolete/purple/clientsig.h Added: obsolete/purple/defines.h Added: obsolete/purple/doc/Makefile Added: obsolete/purple/doc/purple.xml Added: obsolete/purple/doc/purple_admin.xml Added: obsolete/purple/hashtable.c Added: obsolete/purple/hashtable.h Added: obsolete/purple/mapping.c Added: obsolete/purple/mapping.h Added: obsolete/purple/miniclient.c Added: obsolete/purple/miniclient.h Added: obsolete/purple/namespaces.h Added: obsolete/purple/purple.c Added: obsolete/purple/purple.h Added: obsolete/purple/purple_sip.c Added: obsolete/purple/purple_sip.h Added: obsolete/purple/purplepipe.c Added: obsolete/purple/purplepipe.h Added: obsolete/purple/utils.c Added: obsolete/purple/utils.h Removed: modules/iptrtpproxy/Makefile Removed: modules/iptrtpproxy/README Removed: modules/iptrtpproxy/doc/Makefile Removed: modules/iptrtpproxy/doc/iptrtpproxy.xml Removed: modules/iptrtpproxy/doc/iptrtpproxy_admin.xml Removed: modules/iptrtpproxy/iptrtpproxy.c Removed: modules/iptrtpproxy/oob/clean_rtpproxy_attrs Removed: modules/iptrtpproxy/oob/rtpproxy_attrs.sql Removed: modules/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.inc Removed: modules/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.patch Removed: modules/purple/LICENSE Removed: modules/purple/Makefile Removed: modules/purple/README Removed: modules/purple/clientaccount.c Removed: modules/purple/clientaccount.h Removed: modules/purple/clientops.c Removed: modules/purple/clientops.h Removed: modules/purple/clientpipe.c Removed: modules/purple/clientpipe.h Removed: modules/purple/clientsig.c Removed: modules/purple/clientsig.h Removed: modules/purple/defines.h Removed: modules/purple/doc/Makefile Removed: modules/purple/doc/purple.xml Removed: modules/purple/doc/purple_admin.xml Removed: modules/purple/hashtable.c Removed: modules/purple/hashtable.h Removed: modules/purple/mapping.c Removed: modules/purple/mapping.h Removed: modules/purple/miniclient.c Removed: modules/purple/miniclient.h Removed: modules/purple/namespaces.h Removed: modules/purple/purple.c Removed: modules/purple/purple.h Removed: modules/purple/purple_sip.c Removed: modules/purple/purple_sip.h Removed: modules/purple/purplepipe.c Removed: modules/purple/purplepipe.h Removed: modules/purple/utils.c Removed: modules/purple/utils.h --- Diff: https://github.com/kamailio/kamailio/commit/604d55e2065514cabce0329e4fd0c15… Patch: https://github.com/kamailio/kamailio/commit/604d55e2065514cabce0329e4fd0c15…

1 0

git:master:265bf3b7: Makefile.groups: removed the modules purple and iptrtpproxy
by Daniel-Constantin Mierla 05 Dec '16

05 Dec '16

Module: kamailio Branch: master Commit: 265bf3b75a7d4bdf5da5cd32a09f8c3b24444a6e URL: https://github.com/kamailio/kamailio/commit/265bf3b75a7d4bdf5da5cd32a09f8c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-05T14:39:24+01:00 Makefile.groups: removed the modules purple and iptrtpproxy --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/265bf3b75a7d4bdf5da5cd32a09f8c3… Patch: https://github.com/kamailio/kamailio/commit/265bf3b75a7d4bdf5da5cd32a09f8c3… --- diff --git a/Makefile.groups b/Makefile.groups index 2ec00d5..0dd330a 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -86,9 +86,6 @@ mod_list_utils=utils http_client # - modules depending on curl and libevent2 library mod_list_http_async=http_async_client -# - modules depending on purple library -mod_list_purple=purple - # - modules depending on memcache library mod_list_memcached=memcached @@ -163,9 +160,6 @@ mod_list_osp=osp # - modules depending on java library mod_list_java=app_java -# - modules depending on iptables library -mod_list_iptrtpproxy=iptrtpproxy - # - modules depending on gzip library mod_list_gzcompress=gzcompress @@ -206,7 +200,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_perldeps) $(mod_list_cpl) \ $(mod_list_xmpp) $(mod_list_carrierroute) \ $(mod_list_berkeley) $(mod_list_utils) \ - $(mod_list_purple) $(mod_list_memcached) \ + $(mod_list_memcached) \ $(mod_list_tlsdeps) $(mod_list_websocket) \ $(mod_list_snmpstats) $(mod_list_presence) \ $(mod_list_lua) $(mod_list_python) \ @@ -214,7 +208,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_json) $(mod_list_redis) \ $(mod_list_mono) $(mod_list_ims) \ $(mod_list_cassandra) $(mod_list_oracle) \ - $(mod_list_iptrtpproxy) $(mod_list_mi_xmlrpc) \ + $(mod_list_mi_xmlrpc) \ $(mod_list_outbound) $(mod_list_osp) \ $(mod_list_java) $(mod_list_dnssec) \ $(mod_list_sctp) $(mod_list_autheph) \ @@ -331,9 +325,6 @@ module_group_kutils=$(mod_list_utils) # pkg https_async module module_group_khttp_async=$(mod_list_http_async) -# pkg purple module -module_group_kpurple=$(mod_list_purple) - # pkg memcached module module_group_kmemcached=$(mod_list_memcached)

1 0

INFO: kcore internal lib removed
by Daniel-Constantin Mierla 05 Dec '16

05 Dec '16

Hello, mainly for those having private modules or other components for kamailio, take note that the internal library kcore has been removed. It was supposed to be a termporary place where to keep some kamailio specific functions at the time of merging with ser code back in 2008. The main code was related to internal statistics, which was re-implemented as fast counters several years ago, in libkcore being only some wrappers. You have to include now directly the counters.h from core. There were several files with some str operations helpers, not they are exported via strutils.h from core. The sst parser was used only by sst module and moved to it, same being done with some stats helper functions used only by snmpstats module. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

1 0

git:master:0e86b73a: core, libs, modules: removed kcore internal library
by Daniel-Constantin Mierla 05 Dec '16

05 Dec '16

Module: kamailio Branch: master Commit: 0e86b73a9408757d2f5c51430fbfba7353c9017c URL: https://github.com/kamailio/kamailio/commit/0e86b73a9408757d2f5c51430fbfba7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-05T14:27:19+01:00 core, libs, modules: removed kcore internal library - instead of kcore stats wrapers, use directly counters.h from core - parse of sst header moved to sst module (only use) - string helper functions compacted in strutils.h - statistics helper functions used only by snmpstats module moved to it --- Added: modules/misc_radius/radius.h Added: modules/snmpstats/snmp_statistics.c Added: modules/snmpstats/snmp_statistics.h Added: modules/sst/parse_sst.c Added: modules/sst/parse_sst.h Added: parser/parse_privacy.c Added: parser/parse_privacy.h Added: strutils.c Added: strutils.h Modified: Makefile.defs Modified: counters.c Modified: counters.h Modified: fmsg.c Modified: modules/acc/Makefile Modified: modules/acc/acc.c Modified: modules/acc/acc_extra.h Modified: modules/acc/acc_logic.c Modified: modules/acc/acc_mod.c Modified: modules/acc_radius/Makefile Modified: modules/acc_radius/acc_radius_mod.c Modified: modules/app_lua/Makefile Modified: modules/app_lua/app_lua_api.c Modified: modules/app_lua/app_lua_sr.c Modified: modules/app_mono/Makefile Modified: modules/app_mono/app_mono_api.c Modified: modules/auth_db/Makefile Modified: modules/auth_ephemeral/Makefile Modified: modules/auth_radius/Makefile Modified: modules/auth_radius/auth_radius.c Modified: modules/auth_radius/auth_radius.h Modified: modules/auth_radius/extra.h Modified: modules/auth_radius/sterman.c Modified: modules/auth_xkeys/Makefile Modified: modules/auth_xkeys/auth_xkeys.c Modified: modules/avpops/Makefile Modified: modules/carrierroute/Makefile Modified: modules/cdp/Makefile Modified: modules/cfgt/Makefile Modified: modules/cfgt/cfgt_int.c Modified: modules/cfgutils/Makefile Modified: modules/cnxcc/Makefile Modified: modules/cpl-c/Makefile Modified: modules/db_text/Makefile Modified: modules/db_unixodbc/Makefile Modified: modules/db_unixodbc/val.c Modified: modules/dialog/Makefile Modified: modules/dialog/dialog.c Modified: modules/dialog/dlg_db_handler.c Modified: modules/dialog/dlg_handlers.c Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_req_within.c Modified: modules/dialog/dlg_var.c Modified: modules/dispatcher/Makefile Modified: modules/dmq/Makefile Modified: modules/domain/Makefile Modified: modules/domainpolicy/Makefile Modified: modules/domainpolicy/domainpolicy.c Modified: modules/drouting/Makefile Modified: modules/enum/Makefile Modified: modules/enum/enum.c Modified: modules/erlang/Makefile Modified: modules/evapi/Makefile Modified: modules/group/Makefile Modified: modules/htable/Makefile Modified: modules/http_async_client/Makefile Modified: modules/http_async_client/http_multi.h Modified: modules/imc/Makefile Modified: modules/imc/imc.c Modified: modules/ims_auth/Makefile Modified: modules/ims_auth/stats.h Modified: modules/ims_charging/Makefile Modified: modules/ims_dialog/Makefile Modified: modules/ims_dialog/dlg_db_handler.c Modified: modules/ims_dialog/dlg_handlers.c Modified: modules/ims_dialog/dlg_req_within.c Modified: modules/ims_dialog/ims_dialog.c Modified: modules/ims_icscf/Makefile Modified: modules/ims_icscf/stats.h Modified: modules/ims_ocs/Makefile Modified: modules/ims_qos/Makefile Modified: modules/ims_qos/stats.h Modified: modules/ims_registrar_pcscf/Makefile Modified: modules/ims_registrar_pcscf/reg_mod.c Modified: modules/ims_registrar_scscf/Makefile Modified: modules/ims_registrar_scscf/cxdx_sar.c Modified: modules/ims_registrar_scscf/reg_mod.c Modified: modules/ims_registrar_scscf/save.c Modified: modules/ims_registrar_scscf/stats.h Modified: modules/ims_usrloc_pcscf/Makefile Modified: modules/ims_usrloc_pcscf/udomain.h Modified: modules/ims_usrloc_pcscf/usrloc.h Modified: modules/ims_usrloc_scscf/Makefile Modified: modules/ims_usrloc_scscf/udomain.h Modified: modules/kazoo/Makefile Modified: modules/kazoo/kz_trans.c Modified: modules/kex/Makefile Modified: modules/kex/core_stats.c Modified: modules/kex/core_stats.h Modified: modules/lcr/Makefile Modified: modules/misc_radius/extra.h Modified: modules/misc_radius/functions.c Modified: modules/misc_radius/misc_radius.c Modified: modules/mohqueue/Makefile Modified: modules/mohqueue/mohq_common.h Modified: modules/mqueue/Makefile Modified: modules/msilo/Makefile Modified: modules/msilo/msilo.c Modified: modules/nat_traversal/Makefile Modified: modules/nat_traversal/nat_traversal.c Modified: modules/nathelper/Makefile Modified: modules/ndb_redis/Makefile Modified: modules/nsq/Makefile Modified: modules/outbound/Makefile Modified: modules/outbound/ob_mod.c Modified: modules/p_usrloc/Makefile Modified: modules/p_usrloc/udomain.h Modified: modules/path/Makefile Modified: modules/path/path.c Modified: modules/pdb/Makefile Modified: modules/pdt/Makefile Modified: modules/peering/Makefile Modified: modules/peering/peering.c Modified: modules/peering/verify.c Modified: modules/permissions/Makefile Modified: modules/pipelimit/Makefile Modified: modules/pipelimit/pipelimit.c Modified: modules/presence/Makefile Modified: modules/presence/publish.c Modified: modules/pua/Makefile Modified: modules/pua/send_publish.c Modified: modules/pua_bla/Makefile Modified: modules/pua_bla/notify.c Modified: modules/pua_mi/Makefile Modified: modules/pua_mi/mi_func.c Modified: modules/pua_xmpp/Makefile Modified: modules/pua_xmpp/simple2xmpp.c Modified: modules/pv/Makefile Modified: modules/pv/pv_core.c Modified: modules/pv/pv_stats.c Modified: modules/pv/pv_trans.c Modified: modules/rabbitmq/Makefile Modified: modules/ratelimit/Makefile Modified: modules/ratelimit/ratelimit.c Modified: modules/registrar/Makefile Modified: modules/registrar/path.c Modified: modules/registrar/registrar.c Modified: modules/registrar/save.c Modified: modules/rls/Makefile Modified: modules/rls/resource_notify.c Modified: modules/rls/subscribe.c Modified: modules/rtimer/Makefile Modified: modules/rtpengine/Makefile Modified: modules/rtpproxy/Makefile Modified: modules/sca/Makefile Modified: modules/sca/sca_appearance.c Modified: modules/seas/Makefile Modified: modules/sipcapture/Makefile Modified: modules/sipcapture/sipcapture.c Modified: modules/siptrace/Makefile Modified: modules/siptrace/siptrace.c Modified: modules/siputils/Makefile Modified: modules/siputils/chargingvector.c Modified: modules/siputils/sipops.c Modified: modules/sl/Makefile Modified: modules/sl/sl_stats.c Modified: modules/smsops/Makefile Modified: modules/smsops/smsops_impl.c Modified: modules/snmpstats/Makefile Modified: modules/snmpstats/alarm_checks.c Modified: modules/snmpstats/kamailioNet.c Modified: modules/snmpstats/kamailioNetConfig.c Modified: modules/snmpstats/kamailioServer.c Modified: modules/snmpstats/snmpObjects.c Modified: modules/snmpstats/snmpSIPCommonObjects.c Modified: modules/snmpstats/snmpSIPPortTable.c Modified: modules/snmpstats/snmpSIPServerObjects.c Modified: modules/snmpstats/snmpSIPStatusCodesTable.c Modified: modules/snmpstats/snmpstats.c Modified: modules/snmpstats/utilities.c Modified: modules/speeddial/Makefile Modified: modules/sqlops/Makefile Modified: modules/sqlops/sql_trans.c Modified: modules/sst/Makefile Modified: modules/sst/sst.c Modified: modules/sst/sst_handlers.c Modified: modules/statistics/Makefile Modified: modules/statistics/statistics.c Modified: modules/statistics/stats_funcs.c Modified: modules/statsc/Makefile Modified: modules/statsc/statsc_mod.c Modified: modules/textops/Makefile Modified: modules/textops/textops.c Modified: modules/tm/t_append_branches.c Modified: modules/tmx/Makefile Modified: modules/tmx/tmx_mod.c Modified: modules/tsilo/Makefile Modified: modules/tsilo/ts_append.c Modified: modules/tsilo/ts_hash.c Modified: modules/tsilo/ts_store.c Modified: modules/tsilo/tsilo.c Modified: modules/uac/Makefile Modified: modules/uac/auth.c Modified: modules/uri_db/Makefile Modified: modules/usrloc/Makefile Modified: modules/usrloc/udomain.h Modified: modules/websocket/Makefile Modified: modules/websocket/websocket.c Modified: modules/websocket/websocket.h Modified: modules/websocket/ws_conn.c Modified: modules/websocket/ws_conn.h Modified: modules/websocket/ws_frame.c Modified: modules/websocket/ws_handshake.c Modified: modules/xcap_server/Makefile Modified: modules/xcap_server/xcap_server.c Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/squeeze/copyright Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/xenial/copyright Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: sr_module.h Removed: kstats_types.h Removed: lib/kcore/Makefile Removed: lib/kcore/cmpapi.c Removed: lib/kcore/cmpapi.h Removed: lib/kcore/kstats_wrapper.c Removed: lib/kcore/kstats_wrapper.h Removed: lib/kcore/parse_privacy.c Removed: lib/kcore/parse_privacy.h Removed: lib/kcore/parse_sst.c Removed: lib/kcore/parse_sst.h Removed: lib/kcore/radius.h Removed: lib/kcore/regexp.c Removed: lib/kcore/regexp.h Removed: lib/kcore/statistics.c Removed: lib/kcore/statistics.h Removed: lib/kcore/strcommon.c Removed: lib/kcore/strcommon.h --- Diff: https://github.com/kamailio/kamailio/commit/0e86b73a9408757d2f5c51430fbfba7… Patch: https://github.com/kamailio/kamailio/commit/0e86b73a9408757d2f5c51430fbfba7…

1 0

Restructuring source code tree for v5.0
by Daniel-Constantin Mierla 05 Dec '16

05 Dec '16

Hello, I already started playing with various scripts to do the restructuring of the source code tree for v5.0 as we discussed in the past months and I am considering to do it quite soon, in the next few days. The result will look like: /Makefile (only-forwarding make commands to various subdirs) /README|INSTAL|LICENSE|... /src/Makefile* (build makefiles) /src/main.c (main c file to generate the binary) /src/core/*.{c,h} (c code for core, including subfolders such as parser, mem, atomic, ...) /src/lib/* (subfolders with the internal libraries) /src/modules/* (subfolders with the modules) Other subfolders from root directory may be relocated, but to be decided along the way. At the time of doing the restructuring, I will try to merge all the pull requests that look ok. Therefore it would be good that anyone interested in open pull requests to do the review (and merge) meanwhile. Also, I think it would be good to disable travis and nightly master builds during few days when the restructuring happens in order to avoid flooding sr-dev with alerts. If anyone has suggestions to add, do not hesitate to write on mailing lists. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

2 2

[kamailio/kamailio] textops: Behavior of function search_append_body(re, txt) (#882)
by Alberto Llamas 05 Dec '16

05 Dec '16

Hi Guys, I am not sure if this is an intention behavior of this function but when We use it as below: `search_append_body("^c=IN.+$", "b=AS:750");` The result is: `c=IN IP4 192.168.178.30b=AS:750` What we were expecting is that the new parameter was appended in the new line like: ``` c=IN IP4 192.168.178.30 b=AS:750 ``` A workaround we have to do is: `search_append_body("^c=IN.+$", "\r\nb=AS:750"); ` So we think it should be fix in source code since the expected behavior is always the same. Cheers, -- 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/882

3 4

[kamailio/kamailio] Kamailio bridge internal and external network (#883)
by willie zhang 05 Dec '16

05 Dec '16

My kamailio listen at internal ip (can send message to freeswitch ) and external ip (advertise ip). How can I make it auto using internal ip add record route to message of sending to freeswitch and external ip add record route to message of sending to public client. -- 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/883

2 2

git:master:8406a6c4: jsonrpc: increase the size of send buffer for datagram transport
by Daniel-Constantin Mierla 04 Dec '16

04 Dec '16

Module: kamailio Branch: master Commit: 8406a6c450a1fbdb4dc1e05acb6d3443bebf8339 URL: https://github.com/kamailio/kamailio/commit/8406a6c450a1fbdb4dc1e05acb6d344… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-04T22:07:56+01:00 jsonrpc: increase the size of send buffer for datagram transport --- Modified: modules/jsonrpc-s/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/8406a6c450a1fbdb4dc1e05acb6d344… Patch: https://github.com/kamailio/kamailio/commit/8406a6c450a1fbdb4dc1e05acb6d344… --- diff --git a/modules/jsonrpc-s/jsonrpcs_sock.c b/modules/jsonrpc-s/jsonrpcs_sock.c index 7d62490..b4306e0 100644 --- a/modules/jsonrpc-s/jsonrpcs_sock.c +++ b/modules/jsonrpc-s/jsonrpcs_sock.c @@ -315,6 +315,7 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, { char *socket_name; int flags; + int optval; /* create sockets for rx and tx ... */ jsonrpc_dgram_socket_domain = socket_domain; @@ -376,6 +377,15 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, } jsonrpc_dgram_create_reply_socket(socks->tx_sock, socket_domain, err_both); + optval = 64 * 1024; + if (setsockopt(socks->tx_sock, SOL_SOCKET, SO_SNDBUF, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("failed to increse send buffer size via setsockopt " + " SO_SNDBUF (%d) - %d: %s\n", optval, + errno, strerror(errno)); + /* continue, non-critical */ + } + return 0; err_both: close(socks->tx_sock); @@ -517,22 +527,19 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, const struct sockaddr* to, int tolen, int timeout) { int n; - size_t total_len; - total_len = strlen(buf); + unsigned int optlen = sizeof(int); + int optval; - if(total_len == 0 || tolen ==0) + if(len == 0 || tolen ==0) return -1; - if (total_len>JSONRPC_DGRAM_BUF_SIZE) { - LM_DBG("datagram too big, trunking, datagram_size is %i\n", - JSONRPC_DGRAM_BUF_SIZE); - len = JSONRPC_DGRAM_BUF_SIZE; - } /*LM_DBG("destination address length is %i\n", tolen);*/ n=sendto(fd, buf, len, 0, to, tolen); if(n!=len) { - LM_ERR("failed to send the response (%d - %d - %s)\n", - n, errno, strerror(errno)); + getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (int*)&optval, &optlen); + LM_ERR("failed to send the response - ret: %d, len: %d (%d)," + " err: %d - %s)\n", + n, len, optval, errno, strerror(errno)); return n; } LM_DBG("rpc response sent out\n");

1 0

git:master:236fed5a: jsonrpc-s: fixed typo in log message
by Daniel-Constantin Mierla 04 Dec '16

04 Dec '16

Module: kamailio Branch: master Commit: 236fed5a83d0c5b139557d43c17e81dbb4bf9373 URL: https://github.com/kamailio/kamailio/commit/236fed5a83d0c5b139557d43c17e81d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-04T22:07:56+01:00 jsonrpc-s: fixed typo in log message --- Modified: modules/jsonrpc-s/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/236fed5a83d0c5b139557d43c17e81d… Patch: https://github.com/kamailio/kamailio/commit/236fed5a83d0c5b139557d43c17e81d… --- diff --git a/modules/jsonrpc-s/jsonrpcs_sock.c b/modules/jsonrpc-s/jsonrpcs_sock.c index 223dd05..7d62490 100644 --- a/modules/jsonrpc-s/jsonrpcs_sock.c +++ b/modules/jsonrpc-s/jsonrpcs_sock.c @@ -531,7 +531,7 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, /*LM_DBG("destination address length is %i\n", tolen);*/ n=sendto(fd, buf, len, 0, to, tolen); if(n!=len) { - LM_ERR("failed to sent the response (%d - %d:%s)\n", + LM_ERR("failed to send the response (%d - %d - %s)\n", n, errno, strerror(errno)); return n; }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016