sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:5.0:f4ef9ca5: misc/examples: kemi - fixed cfgengine for javascript engine
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: f4ef9ca5108cad5a8ee7549ec3434f1a03fd4115 URL: https://github.com/kamailio/kamailio/commit/f4ef9ca5108cad5a8ee7549ec3434f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T13:51:42+02:00 misc/examples: kemi - fixed cfgengine for javascript engine (cherry picked from commit d01141e635e35c2f7b204e11b4a2587e5993d155) --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/f4ef9ca5108cad5a8ee7549ec3434f1… Patch: https://github.com/kamailio/kamailio/commit/f4ef9ca5108cad5a8ee7549ec3434f1… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index a9cdc78..41f06ba 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -366,7 +366,7 @@ cfgengine "lua" #!ifdef WITH_CFGJSDT modparam("app_jsdt", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-jsdt.js") -cfgengine "lua" +cfgengine "jsdt" #!else cfgengine "native" include_file "/usr/local/etc/kamailio/kamailio-basic-kemi-native.cfg"

1 0

git:5.0:d3a67fec: erlang: allow user to set ERLANG_xxxDIR
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: d3a67fec5eeca80f0feb46422ab3b5ef84016616 URL: https://github.com/kamailio/kamailio/commit/d3a67fec5eeca80f0feb46422ab3b5e… Author: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T13:51:14+02:00 erlang: allow user to set ERLANG_xxxDIR If erl is not installed on the system or can not be used (for example when cross-compiling), then erlang module will use the values set by the user in ERLANG_INCDIR and ERLANG_LIBDIR instead of returning en error Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> (cherry picked from commit 0d83c02f6389bf0adf9cc8afd5e19e2d0e94cd1a) --- Modified: src/modules/erlang/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d3a67fec5eeca80f0feb46422ab3b5e… Patch: https://github.com/kamailio/kamailio/commit/d3a67fec5eeca80f0feb46422ab3b5e… --- diff --git a/src/modules/erlang/Makefile b/src/modules/erlang/Makefile index e75176c..1886bd0 100644 --- a/src/modules/erlang/Makefile +++ b/src/modules/erlang/Makefile @@ -10,9 +10,12 @@ ERLANG=$(shell which erl) ifneq ($(ERLANG),) ERLANG_LIBDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1) ERLANG_INCDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1) -else +endif + +ifeq ($(ERLANG_LIBDIR)$(ERLANG_INCDIR),) $(error Not found Erlang) endif + LIBS=-L$(ERLANG_LIBDIR) -lei -lpthread DEFS+=-I$(ERLANG_INCDIR)

1 0

git:5.0:cecb5186: utils/pdbt: FreeBSD fix, gcc is hardcoded, header is missing
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: cecb51863e3b92577ea600089254ed4f30e9ce0d URL: https://github.com/kamailio/kamailio/commit/cecb51863e3b92577ea600089254ed4… Author: Rick Barenthin <rb(a)terralink.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T13:50:42+02:00 utils/pdbt: FreeBSD fix, gcc is hardcoded, header is missing - use CC environment variable if set - added missing sys/stat.h header (cherry picked from commit 32e1e5040d2ff5e13d5bd0373e7edd6cef56f172) --- Modified: utils/pdbt/Makefile Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/cecb51863e3b92577ea600089254ed4… Patch: https://github.com/kamailio/kamailio/commit/cecb51863e3b92577ea600089254ed4… --- diff --git a/utils/pdbt/Makefile b/utils/pdbt/Makefile index b16d3cb..e354f6c 100644 --- a/utils/pdbt/Makefile +++ b/utils/pdbt/Makefile @@ -1,3 +1,11 @@ +#set some vars from the environment (and not make builtins) +CC := $(shell echo "$${CC}") + +# find compiler name & version +ifeq ($(CC),) + CC=gcc +endif + .phony: all clean install header=common.h carrier.h dt.h dtm.h pdb_server_backend.h log.h @@ -10,13 +18,13 @@ extdep=Makefile all: pdbt pdb_server $(obj): %.o : %.c %.h $(header) $(extdep) - gcc $(cflags) -c $< + $(CC) $(cflags) -c $< pdbt: pdbt.c $(obj) $(header) $(extdep) - gcc $(cflags) -o $@ $< $(obj) + $(CC) $(cflags) -o $@ $< $(obj) pdb_server: pdb_server.c $(pdb_server_obj) $(header) $(extdep) - gcc $(cflags) -o $@ $< $(pdb_server_obj) + $(CC) $(cflags) -o $@ $< $(pdb_server_obj) clean: rm -f *~ *.o pdbt pdb_server diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index fac466a..afd3695 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -28,6 +28,7 @@ #include <poll.h> #include <ctype.h> #include <sys/socket.h> +#include <sys/stat.h> #include <netinet/in.h> #include <arpa/inet.h> #include <netdb.h>

1 0

git:5.0:ec2d2cd2: rabbitmq: added link to rabbitmq c lib
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: ec2d2cd29400ec198377033a09edcc8843747190 URL: https://github.com/kamailio/kamailio/commit/ec2d2cd29400ec198377033a09edcc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T13:49:42+02:00 rabbitmq: added link to rabbitmq c lib - GH #903 (cherry picked from commit 52e8634807b8c64a8ecd432a3c0e024185d3a447) --- Modified: src/modules/rabbitmq/doc/rabbitmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ec2d2cd29400ec198377033a09edcc8… Patch: https://github.com/kamailio/kamailio/commit/ec2d2cd29400ec198377033a09edcc8… --- diff --git a/src/modules/rabbitmq/doc/rabbitmq_admin.xml b/src/modules/rabbitmq/doc/rabbitmq_admin.xml index 6165baf..7bb6003 100644 --- a/src/modules/rabbitmq/doc/rabbitmq_admin.xml +++ b/src/modules/rabbitmq/doc/rabbitmq_admin.xml @@ -10,7 +10,7 @@  <chapter xmlns:xi="http://www.w3.org/2001/XInclude"> - + <title>&adminguide;</title> <section> @@ -18,7 +18,8 @@ <para> This module offers amqp communication using librabbitmq. - This module was created based on <emphasis>rabbitmq-c</emphasis> C client. + This module was created using <emphasis>rabbitmq-c</emphasis> C client + (<ulink url="https://github.com/alanxz/rabbitmq-c">https://github.com/alanxz/rabbitmq-c</ulink>). An new amqp connection is setup on a per-children basis, when Kamailio starts. If connection is lost, the process tries to re-establish it when a new amqp action is required. </para> @@ -60,7 +61,8 @@ <itemizedlist> <listitem> <para> - <emphasis>librabbitmq-dev</emphasis>. + <emphasis>librabbitmq-dev</emphasis> - + (<ulink url="https://github.com/alanxz/rabbitmq-c">https://github.com/alanxz/rabbitmq-c</ulink>). </para> </listitem> </itemizedlist>

1 0

git:5.0:6be63b8e: acc: Fix for no cdr after Kamailio 5.0 restart
by Lucian Balaceanu 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: 6be63b8e0141bb1fbb3c1ff3ba5001d6353c65b3 URL: https://github.com/kamailio/kamailio/commit/6be63b8e0141bb1fbb3c1ff3ba5001d… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-04-04T14:26:55+03:00 acc: Fix for no cdr after Kamailio 5.0 restart - created cdr_on_load() to be called on DLGCB_LOAD (cherry picked from commit b70382583ea2c7962f7268db3e672236fb35e521) --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/6be63b8e0141bb1fbb3c1ff3ba5001d… Patch: https://github.com/kamailio/kamailio/commit/6be63b8e0141bb1fbb3c1ff3ba5001d… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index f9b25eb..4ffab23 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -588,7 +588,7 @@ static void cdr_on_start( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params) + if( !dialog ) { LM_ERR("invalid values\n!"); return; @@ -663,7 +663,7 @@ static void cdr_on_end( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params) + if( !dialog ) { LM_ERR("invalid values\n!"); return; @@ -724,7 +724,7 @@ static void cdr_on_destroy( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params) + if( !dialog ) { LM_ERR("invalid values\n!"); return; @@ -738,7 +738,7 @@ static void cdr_on_create( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params || !params->req) + if( !dialog ) { LM_ERR( "invalid values\n!"); return; @@ -795,6 +795,65 @@ static void cdr_on_create( struct dlg_cell* dialog, return; } } + +/* callback for loading a dialog frm database */ +static void cdr_on_load( struct dlg_cell* dialog, + int type, + struct dlg_cb_params* params) +{ + if( !dialog ) + { + LM_ERR( "invalid values\n!"); + return; + } + + if( cdr_enable == 0) + { + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_CONFIRMED, cdr_on_start, 0, 0) != 0) + { + LM_ERR("can't register create dialog CONFIRM callback\n"); + return; + } + + if(_acc_cdr_on_failed==1) { + if( dlgb.register_dlgcb( dialog, DLGCB_FAILED, cdr_on_failed, 0, 0) != 0) + { + LM_ERR("can't register create dialog FAILED callback\n"); + return; + } + } + + if( dlgb.register_dlgcb( dialog, DLGCB_TERMINATED, cdr_on_end, 0, 0) != 0) + { + LM_ERR("can't register create dialog TERMINATED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_TERMINATED_CONFIRMED, cdr_on_end_confirmed, 0, 0) != 0) + { + LM_ERR("can't register create dialog TERMINATED CONFIRMED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_EXPIRED, cdr_on_expired, 0, 0) != 0) + { + LM_ERR("can't register create dialog EXPIRED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_DESTROY, cdr_on_destroy, 0, 0) != 0) + { + LM_ERR("can't register create dialog DESTROY callback\n"); + return; + } + + LM_DBG("dialog '%p' loaded!", dialog); + +} + /* convert the extra-data string into a list and store it */ int set_cdr_extra( char* cdr_extra_value) { @@ -859,6 +918,12 @@ int init_cdr_generation( void) return -1; } + if( dlgb.register_dlgcb( 0, DLGCB_LOADED, cdr_on_load, 0, 0) != 0) + { + LM_ERR("can't register create callback\n"); + return -1; + } + return 0; }

1 0

git:4.4:4f785ac6: core: parser - allow more chars in mime type
by Camille Oudot 04 Apr '17

04 Apr '17

Module: kamailio Branch: 4.4 Commit: 4f785ac67696e5de8aa6e888de69a6180214784f URL: https://github.com/kamailio/kamailio/commit/4f785ac67696e5de8aa6e888de69a61… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2017-04-04T11:19:18+02:00 core: parser - allow more chars in mime type (cherry picked from commit 5bb4eb4d6546e2d0a2d911b09797172a0a2a2b83) --- Modified: parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/4f785ac67696e5de8aa6e888de69a61… Patch: https://github.com/kamailio/kamailio/commit/4f785ac67696e5de8aa6e888de69a61… --- diff --git a/parser/parse_content.c b/parser/parse_content.c index edb109a..6546b01 100644 --- a/parser/parse_content.c +++ b/parser/parse_content.c @@ -38,7 +38,9 @@ #define is_mime_char(_c_) \ - (isalpha((int)_c_) || (_c_)=='-' || (_c_)=='+' || (_c_)=='.' || (_c_)=='_') + (isalnum((int)_c_) || (_c_)=='-' || (_c_)=='+' || (_c_)=='.' || (_c_)=='_' \ + || (_c_)=='!' || (_c_)=='%' || (_c_)=='*' \ + || (_c_)=='\'' || (_c_)=='`' || (_c_)=='~') #define is_char_equal(_c_,_cs_) \ ( (isalpha((int)_c_)?(((_c_)|0x20)==(_cs_)):((_c_)==(_cs_)))==1 )

1 0

git:5.0:bf86b73c: core: parser - allow more chars in mime type
by Camille Oudot 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: bf86b73c9746ad46f7ad7bff2dc76c92ba6d6955 URL: https://github.com/kamailio/kamailio/commit/bf86b73c9746ad46f7ad7bff2dc76c9… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2017-04-04T11:16:12+02:00 core: parser - allow more chars in mime type (cherry picked from commit 5bb4eb4d6546e2d0a2d911b09797172a0a2a2b83) --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/bf86b73c9746ad46f7ad7bff2dc76c9… Patch: https://github.com/kamailio/kamailio/commit/bf86b73c9746ad46f7ad7bff2dc76c9… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index edb109a..6546b01 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -38,7 +38,9 @@ #define is_mime_char(_c_) \ - (isalpha((int)_c_) || (_c_)=='-' || (_c_)=='+' || (_c_)=='.' || (_c_)=='_') + (isalnum((int)_c_) || (_c_)=='-' || (_c_)=='+' || (_c_)=='.' || (_c_)=='_' \ + || (_c_)=='!' || (_c_)=='%' || (_c_)=='*' \ + || (_c_)=='\'' || (_c_)=='`' || (_c_)=='~') #define is_char_equal(_c_,_cs_) \ ( (isalpha((int)_c_)?(((_c_)|0x20)==(_cs_)):((_c_)==(_cs_)))==1 )

1 0

[kamailio/kamailio] Problem parsing content-type with numbers in multipart INVITE (#1053)
by Albert Petit 04 Apr '17

04 Apr '17

### Description When sending a multipart INVITE with a part having the following content type **application/vnd.3gpp.mcptt-info+xml** there is a parse error on content type header causing for eg we can't force rtpproxy to replace ports on a call leg. >From **parse_content.c** implementation It seems numbers are not accepted inside a content type header. (https://github.com/kamailio/kamailio/blob/master/src/core/parser/parse_cont…) This might cause issues with MCPTT Rel 13 3GPP specs (http://www.arib.or.jp/english/html/overview/doc/STD-T63V12_20/5_Appendix/Re…) or other content type defined by 3gpp ( eg of other content types defined in iana like https://www.iana.org/assignments/media-types/application/3gpp-ims+xml , etc.) See attached conversation in user-list http://lists.sip-router.org/pipermail/sr-users/2017-April/096594.html ### Troubleshooting See below attached logs generated by Kamailio when processing that INVITE and a sample of INVITE message causing the issue (cut&paste from wireshark) #### Reproduction See attached INVITE or just send a multipart INVITE with a body part that has content type application/vnd.3gpp.mcptt-info+xml #### Log Messages See log messages generated when trying to force rtpproxy Apr 3 18:31:21 mcptt /usr/sbin/kamailio[3232]: INFO: <script>: forcing RTP proxy for INVITE message Apr 3 18:31:21 mcptt /usr/sbin/kamailio[3232]: ERROR: <core> [core/parser/parse_content.c:370]: decode_mime_type(): ERROR:decode_mime_type: parse error near in [application/vnd.3gpp.mcptt-info+xml] char[51][3] offset=16 #### SIP Traffic INVITE sip:mcpttparticipating@genaker.net SIP/2.0 Record-Route: <sip:10.1.1.123:6074;transport=tcp;lr=on;ftag=i3b01a;nat=yes> Call-ID: db6b10362447354bc9819df9a9046ecb(a)10.1.1.222 CSeq: 1 INVITE From: <sip:blue1@genaker.net>;tag=i3b01a To: <sip:ccw@genaker.net;poc-group=blues> Via: SIP/2.0/TCP 10.1.1.123:6074;branch=z9hG4bK15a9.1c063dec40e772152f44c026a1627082.0;i=f Via: SIP/2.0/TCP 10.1.1.222:5070;received=10.1.1.222;rport=55173;branch=z9hG4bK-363135-1750dc6e97437e4788f446f2d818b60a Max-Forwards: 69 Contact: <sip:blue1@10.1.1.222:55173>;transport=tcp;+g.3gpp.mcptt;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mcptt";isfocus Accept-Contact: *;+g.3gpp.mcptt;require;explicit Accept-Contact: *;+g.3gpp.icsi-ref="urn:urn-7:3gpp-service.ims.icsi.mcptt";require;explicit P-Preferred-Service: urn:urn-7:3gpp-service.ims.icsi.mcptt P-Preferred-Identity: <sip:blue1@genaker.net> User-Agent: PoC-client/3GPP-Rel13 GenakerPTT/v2.03.01 - [f661833_334]d/BV6000/SDK23/FplatinumMcptt Session-Expires: 3600 Min-SE: 90 Supported: replaces, 100rel, timer, norefersub, timer, answermode, eventlist Resource-Priority: mcpttp.5 Content-Type: multipart/mixed;boundary=gnkboundary Content-Length: 997 --gnkboundary Content-Type: application/sdp v=0 o=- 3626700268 3626700268 IN IP4 10.1.1.222 s=spimedia c=IN IP4 10.1.1.222 t=0 0 a=X-nat:0 m=audio 10002 RTP/AVP 106 a=rtcp:10003 IN IP4 10.1.1.222 i=speech a=rtpmap:106 AMR-WB/16000 a=fmtp:106 mode-change-period=1; mode-change-capability=2; mode-change-neighbor=0; max-red=0 a=sendrecv a=ptime:100 a=maxptime:400 m=application 10003 udp MCPTT a=fmtp:MCPTT mc_queueing;mc_priority=1 --gnkboundary Content-Type: application/vnd.3gpp.mcptt-info+xml <?xml version="1.0" encoding="UTF-8"?> <mcpttinfo xmlns="urn:3gpp:ns:mcpttInfo:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <mcptt-Params> <session-type>chat</session-type> <mcptt-request-uri type="Normal"> <mcpttURI>sip:ccw@genaker.net;poc-group=blues</mcpttURI> </mcptt-request-uri> <mcptt-client-id type="Normal"> <mcpttURI>urn:uuid:00000000-0000-1000-8000-AABBCCDDEEFF</mcpttURI> </mcptt-client-id> </mcptt-Params> </mcpttinfo> --gnkboundary-- ### Possible Solutions Accept numbers in the content type header Maybe accepting numbers on following definition at the same **parse_content.c** file: #define is_mime_char(_c_) \ (isalpha((int)_c_) || (_c_)=='-' || (_c_)=='+' || (_c_)=='.' || (_c_)=='_') ### Additional Information [root@mcptt ~]# kamailio -v version: kamailio 5.0.0 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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, DsEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 19:22:29 Mar 16 2017 with gcc 4.8.5 * **Operating System**: CentOS7 Linux dev 3.10.0-514.10.2.el7.x86_64 #1 SMP Fri Mar 3 00:04:05 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/1053

2 3

git:master:960b761e: Merge pull request #1055 from kamailio/co/more_mime_chars
by GitHub 03 Apr '17

03 Apr '17

Module: kamailio Branch: master Commit: 960b761e527b903dc8e53014cc0b08df8b0d81b3 URL: https://github.com/kamailio/kamailio/commit/960b761e527b903dc8e53014cc0b08d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-03T21:22:10+02:00 Merge pull request #1055 from kamailio/co/more_mime_chars core: parser - allow more chars in mime type --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/960b761e527b903dc8e53014cc0b08d… Patch: https://github.com/kamailio/kamailio/commit/960b761e527b903dc8e53014cc0b08d… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index edb109a..6546b01 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -38,7 +38,9 @@ #define is_mime_char(_c_) \ - (isalpha((int)_c_) || (_c_)=='-' || (_c_)=='+' || (_c_)=='.' || (_c_)=='_') + (isalnum((int)_c_) || (_c_)=='-' || (_c_)=='+' || (_c_)=='.' || (_c_)=='_' \ + || (_c_)=='!' || (_c_)=='%' || (_c_)=='*' \ + || (_c_)=='\'' || (_c_)=='`' || (_c_)=='~') #define is_char_equal(_c_,_cs_) \ ( (isalpha((int)_c_)?(((_c_)|0x20)==(_cs_)):((_c_)==(_cs_)))==1 )

1 0

git:master:5bb4eb4d: core: parser - allow more chars in mime type
by Camille Oudot 03 Apr '17

03 Apr '17

Module: kamailio Branch: master Commit: 5bb4eb4d6546e2d0a2d911b09797172a0a2a2b83 URL: https://github.com/kamailio/kamailio/commit/5bb4eb4d6546e2d0a2d911b09797172… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2017-04-03T20:49:51+02:00 core: parser - allow more chars in mime type --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/5bb4eb4d6546e2d0a2d911b09797172… Patch: https://github.com/kamailio/kamailio/commit/5bb4eb4d6546e2d0a2d911b09797172… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index edb109a..6546b01 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -38,7 +38,9 @@ #define is_mime_char(_c_) \ - (isalpha((int)_c_) || (_c_)=='-' || (_c_)=='+' || (_c_)=='.' || (_c_)=='_') + (isalnum((int)_c_) || (_c_)=='-' || (_c_)=='+' || (_c_)=='.' || (_c_)=='_' \ + || (_c_)=='!' || (_c_)=='%' || (_c_)=='*' \ + || (_c_)=='\'' || (_c_)=='`' || (_c_)=='~') #define is_char_equal(_c_,_cs_) \ ( (isalpha((int)_c_)?(((_c_)|0x20)==(_cs_)):((_c_)==(_cs_)))==1 )

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 April 2017