sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
301 discussions

git:master:bc01d8d6: dmq_usrloc: use new version of serialized structure returned by usrloc (now includes received address)

by Charles Chance

Module: kamailio Branch: master Commit: bc01d8d6c6abfc7912a27df3ac23bffd818758e9 URL: https://github.com/kamailio/kamailio/commit/bc01d8d6c6abfc7912a27df3ac23bff… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-07-15T09:48:57+01:00 dmq_usrloc: use new version of serialized structure returned by usrloc (now includes received address) --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/bc01d8d6c6abfc7912a27df3ac23bff… Patch: https://github.com/kamailio/kamailio/commit/bc01d8d6c6abfc7912a27df3ac23bff… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index b826802..c174ac9 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -96,7 +96,7 @@ void usrloc_get_all_ucontact(dmq_node_t* node) { int rval, len=0; void *buf, *cp; - str c; + str c, recv; str path; str ruid; unsigned int aorhash; @@ -145,6 +145,9 @@ void usrloc_get_all_ucontact(dmq_node_t* node) break; c.s = (char*)cp + sizeof(c.len); cp = (char*)cp + sizeof(c.len) + c.len; + memcpy(&(recv.len), cp, sizeof(recv.len)); + recv.s = (char*)cp + sizeof(recv.len); + cp = (char*)cp + sizeof(recv.len) + recv.len; memcpy( &send_sock, cp, sizeof(send_sock)); cp = (char*)cp + sizeof(send_sock); memcpy( &flags, cp, sizeof(flags));

9 years, 4 months

[kamailio] UAC trouble with REGISTER to provider (#140)

by ovoshlook

Hello. We use UAC for RGISTER some trunks After fiew days normally work we have an issue that UAC not respond to 401 reply with WWW-Authenticate with reREGISTER with WWW. We have only 2 packets- REGISTR and 401. IP 10.0.1.12.5068 > 1.2.3.4.5060: UDP, length 467 E.......@..F ...............REGISTER sip:provider.com SIP/2.0 Via: SIP/2.0/UDP my.service.com:5068;branch=z9hG4bKdb22.edd7eac5000000000000000000000000.0 To: <sip:login@provider.com> From: <sip:login@provider.com>;tag=6a39af2190f8b2c99cc63bfeb3a3959c-bfba CSeq: 10 REGISTER Call-ID: 5e171580088d170a-9952(a)10.0.1.12 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (4.3.0-dev5 (x86_64/linux)) Contact: <sip:login@my.service.com:5068> Expires: 360 IP 1.2.3.4.5060 > 10.0.1.12.5068: UDP, length 571 Q.......-. ........C.NSIP/2.0 401 Unauthorized Via: SIP/2.0/UDP my.service.com:5068;branch=z9hG4bKdb22.edd7eac5000000000000000000000000.0;received=23.100.24.250 From: <sip:login@provider.com>;tag=6a39af2190f8b2c99cc63bfeb3a3959c-bfba To: <sip:login@provider.com>;tag=as1550511c Call-ID: 5e171580088d170a-9952(a)10.0.1.12 CSeq: 10 REGISTER Server: FastTel SoftSwitch Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH Supported: replaces WWW-Authenticate: Digest algorithm=MD5, realm="provider.com", nonce="109104dc" Content-Length: 0 We have another trunk and reREGISTER is correctly REGISTER sip:another_prov.com SIP/2.0 Via: SIP/2.0/UDP my.service.com:5068;branch=z9hG4bK7fd1.3d7c2fd7000000000000000000000000.0 To: <sip:login_to_another_prov@another_prov.com> From: <sip:login_to_another_prov@another_prov.com>;tag=6a39af2190f8b2c99cc63bfeb3a3959c-f8ba CSeq: 10 REGISTER Call-ID: 5e171580088d1edd-9952(a)10.0.1.12 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (4.3.0-dev5 (x86_64/linux)) Contact: <sip:login_to_another_prov@my.service.com:5068> Expires: 360 IP another_prov.com.5060 > 10.0.1.12.5068: UDP, length 544 E..<F...$. .6... ........(..SIP/2.0 401 Unauthorized Via: SIP/2.0/UDP my.service.com:5068;branch=z9hG4bK7fd1.3d7c2fd7000000000000000000000000.0;rport=5068;received=23.100.28.126 To: <sip:login_to_another_prov@another_prov.com>;tag=04e2a294d0728b89107e081a19babab4.d569 From: <sip:login_to_another_prov@another_prov.com>;tag=6a39af2190f8b2c99cc63bfeb3a3959c-f8ba CSeq: 10 REGISTER Call-ID: 5e171580088d1edd-9952(a)10.0.1.12 WWW-Authenticate: Digest realm="another_prov.com", nonce="VTifD1U4neNLMSYRoxNlOpD7hPSu3ET3" Server: kamailio (4.2.1 (x86_64/linux)) Content-Length: 0 IP 10.0.1.12.5068 > another_prov.com.5060: UDP, length 690 E...uT..@... ...6...........REGISTER sip:another_prov.com SIP/2.0 Via: SIP/2.0/UDP my.service.com:5068;branch=z9hG4bK8fd1.ea73d070000000000000000000000000.0 To: <sip:login_to_another_prov@another_prov.com> From: <sip:login_to_another_prov@another_prov.com>;tag=6a39af2190f8b2c99cc63bfeb3a3959c-f8ba CSeq: 11 REGISTER Call-ID: 5e171580088d1edd-9952(a)10.0.1.12 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (4.3.0-dev5 (x86_64/linux)) Contact: <sip:login_to_another_prov@my.service.com:5068> Expires: 360 Authorization: Digest username="login_to_another_prov", realm="another_prov.com", nonce="VTifD1U4neNLMSYRoxNlOpD7hPSu3ET3", uri="sip:another_prov.com", response="2ee14a437173700e88056279b854749f", algorithm=MD5 --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/140

9 years, 4 months

[kamailio] Unquoted IPv6 Contact header alias parameter causes issues with Asterisk (PJSIP) & TOPOH module (#120)

by Anthony Messina

When using Kamailio from the master branch, I'm encountering an issue where IPv6 contact address aliases that are added via ```set_contact_alias()``` for WebSocket connections (for example) are unquoted and create problems for Asterisk: ``` pjsip:0 <?>: sip_transport. Error processing 3633 bytes packet from UDP 10.0.0.1:5060 : PJSIP syntax error exception when parsing 'Request Line' header on line 11 col 129: ``` and TOPOH garbles the Request-URI when processing the ACK: ``` WARNING: sanity [sanity.c:236]: check_ruri_scheme(): failed to parse request uri [�a�{1me▒s�na@50�9��1.�8:�2v0;i��a��=11>7�n7x>10O�2v0~1] ``` I have tested this with CSipSimple nightly branch (PJSIP) Asterisk 13.2.0 (PJSIP), Google Chrome 41.0.2272.118, and Firefox 37 and all fail to handle the Contact alias parameter properly. An example of an invite that shows this issue follows (this INVITE is without TOPOH on). ``` INVITE sip:testuser@example.com SIP/2.0 Record-Route: <sip:10.0.0.1;r2=on;lr=on;ftag=t5r2736hf9;nat=yes> Record-Route: <sip:[2001:db8::98]:5061;transport=ws;r2=on;lr=on;ftag=t5r2736hf9;nat=yes> Via: SIP/2.0/UDP 10.0.0.1;branch=z9hG4bKa3e8.2bb6508fbc0cf8cc55c1eb6c0eca0b38.0 Via: SIP/2.0/WSS 2e6orc23ptjv.invalid;rport=43691;received=2001:db8::99;branch=z9hG4bK450538 Max-Forwards: 69 To: <sip:testuser@example.com> From: "WS Test User 1" <sip:wstest1@example.com>;tag=t5r2736hf9 Call-ID: uugmpjgjpoklrnf0um56 CSeq: 7244 INVITE Contact: <sip:wstest1@example.com;gr=urn:uuid:2e54e8a2-66e4-433a-a024-b57f3665a44b;alias=[2001:db8::99]~43691~6> Allow: ACK,CANCEL,BYE,OPTIONS,INFO,NOTIFY,INVITE Content-Type: application/sdp Supported: gruu,outbound User-Agent: SIP.js/0.6.4 Content-Length: 2768 v=0 o=- 867554869709517848 2 IN IP4 10.0.0.1 s=- t=0 0 a=msid-semantic: WMS livWfUwMWQJMemgnFyBQDf1VXUo9Q0AXwHnH m=audio 30158 RTP/SAVP 111 103 104 9 0 8 106 105 13 126 c=IN IP4 10.0.0.1 a=rtpmap:111 opus/48000/2 a=fmtp:111 minptime=10; useinbandfec=1 a=rtpmap:103 ISAC/16000 a=rtpmap:104 ISAC/32000 a=rtpmap:9 G722/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:106 CN/32000 a=rtpmap:105 CN/16000 a=rtpmap:13 CN/8000 a=rtpmap:126 telephone-event/8000 a=maxptime:60 a=ssrc:1444733772 cname:CuBdEZ9bIWQc1sE+ a=ssrc:1444733772 msid:livWfUwMWQJMemgnFyBQDf1VXUo9Q0AXwHnH ebd0066b-73b9-467c-b696-36e0fa7d72b7 a=ssrc:1444733772 mslabel:livWfUwMWQJMemgnFyBQDf1VXUo9Q0AXwHnH a=ssrc:1444733772 label:ebd0066b-73b9-467c-b696-36e0fa7d72b7 a=sendrecv a=rtcp:30159 a=rtcp-mux a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:/fmyETo1BwAlupltb64sy5Za6e37BW0p5jMmvqHU a=setup:actpass a=fingerprint:sha-1 76:27:60:1E:64:94:B4:6E:8A:64:72:2D:41:2C:B8:F3:FF:4C:1D:56 a=ice-ufrag:U4XlaM4U a=ice-pwd:HqnTPTU5DY3j1yB4XVEL9rs1tn a=candidate:vVzo18e51E8EXCNy 1 UDP 2130706431 10.0.0.1 30158 typ host a=candidate:vVzo18e51E8EXCNy 2 UDP 2130706430 10.0.0.1 30159 typ host a=candidate:xCpWH2paVucFSQXn 1 UDP 2130706175 2001:db8::1 30158 typ host a=candidate:xCpWH2paVucFSQXn 2 UDP 2130706174 2001:db8::1 30159 typ host m=video 30196 RTP/SAVP 100 116 117 96 c=IN IP4 10.0.0.1 a=rtpmap:100 VP8/90000 a=rtcp-fb:100 ccm fir a=rtcp-fb:100 nack a=rtcp-fb:100 nack pli a=rtcp-fb:100 goog-remb a=rtpmap:116 red/90000 a=rtpmap:117 ulpfec/90000 a=rtpmap:96 rtx/90000 a=fmtp:96 apt=100 a=ssrc-group:FID 616715905 3177427003 a=ssrc:616715905 cname:CuBdEZ9bIWQc1sE+ a=ssrc:616715905 msid:livWfUwMWQJMemgnFyBQDf1VXUo9Q0AXwHnH bb5df7ec-28a9-4e94-89a3-2ebb45a9f5bb a=ssrc:616715905 mslabel:livWfUwMWQJMemgnFyBQDf1VXUo9Q0AXwHnH a=ssrc:616715905 label:bb5df7ec-28a9-4e94-89a3-2ebb45a9f5bb a=ssrc:3177427003 cname:CuBdEZ9bIWQc1sE+ a=ssrc:3177427003 msid:livWfUwMWQJMemgnFyBQDf1VXUo9Q0AXwHnH bb5df7ec-28a9-4e94-89a3-2ebb45a9f5bb a=ssrc:3177427003 mslabel:livWfUwMWQJMemgnFyBQDf1VXUo9Q0AXwHnH a=ssrc:3177427003 label:bb5df7ec-28a9-4e94-89a3-2ebb45a9f5bb a=sendrecv a=rtcp:30197 a=rtcp-mux a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:qQRmOwum0YFHgKKzt2dRX0uAQhSwlmxscI3P3JUI a=setup:actpass a=fingerprint:sha-1 76:27:60:1E:64:94:B4:6E:8A:64:72:2D:41:2C:B8:F3:FF:4C:1D:56 a=ice-ufrag:ISaptX08 a=ice-pwd:mxP343kHexU8SwtbCeRj4WyMNI a=candidate:vVzo18e51E8EXCNy 1 UDP 2130706431 10.0.0.1 30196 typ host a=candidate:vVzo18e51E8EXCNy 2 UDP 2130706430 10.0.0.1 30197 typ host a=candidate:xCpWH2paVucFSQXn 1 UDP 2130706175 2001:db8::1 30196 typ host a=candidate:xCpWH2paVucFSQXn 2 UDP 2130706174 2001:db8::1 30197 typ host ``` I believe that the Contact header alias parameter might need quotes in order to properly handle the bracketed IPv6 alias address, something like the following, but unfortunately I haven't been able to find evidence to be certain that this is the fix, though I do notice that parameters in headers with special characters like brackets are often quoted. ``` Contact: <sip:wstest1@example.com;gr=urn:uuid:2e54e8a2-66e4-433a-a024-b57f3665a44b;alias="[2001:db8::99]~43691~6"> ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/120

9 years, 4 months

[kamailio] Errors work BLF modules pua and presence (#104)

by klistrod

Errors work BLF modules pua and presence: loadmodule "presence.so" loadmodule "presence_xml.so" loadmodule "presence_dialoginfo.so" loadmodule "pua.so" loadmodule "pua_dialoginfo.so" modparam("presence", "db_url", DBURL) modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) modparam("presence_dialoginfo", "force_single_dialog", 1) 5(18085) ERROR: presence [publish.c:139]: msg_presentity_clean(): event not found 5(18085) ERROR: db_mysql [km_dbase.c:123]: db_mysql_submit_query(): driver error on query: Duplicate entry 'a.1425449702.18081.57.5---' for key 'pua_idx' 5(18085) ERROR: <core> [db_query.c:335]: db_do_update(): error while submitting query 5(18085) ERROR: pua [pua.c:1079]: db_update(): while updating in database --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/104

9 years, 4 months

[kamailio] 4.3 compiler warnings (#185)

by juha-h

I'm getting the following new (compared to k 4.2 on Debian Wheezy) compiler warnings when I build k 4.3 on Debian Jessie. It would be nice to get rid of them, because otherwise it gets hard to find real issues appearing during build. Same applies to 'old' tls module warnings. -- Juha ------------------------------------------------------------------------------------------------------------------------------ CC (gcc) [sip-proxy] mem/tlsf.o mem/tlsf.c:583:24: warning: 'block_trim_free_leading' defined but not used [-Wunused-function] static block_header_t* block_trim_free_leading(control_t* control, block_header_t* block, size_t size) ^ ... CC (gcc) [sip-proxy] cfg/cfg_ctx.o cfg/cfg_ctx.c: In function 'cfg_set_now': cfg/cfg_ctx.c:485:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] group_inst = (cfg_group_inst_t *)translate_pointer((char *)new_array, ^ cfg/cfg_ctx.c:489:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ cfg/cfg_ctx.c:559:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (block && (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array)) ^ cfg/cfg_ctx.c:559:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:560:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] new_array = CFG_GROUP_META(block, group)->array; ^ cfg/cfg_ctx.c:579:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[i] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c: In function 'cfg_commit': cfg/cfg_ctx.c:1120:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (!(CFG_GROUP_META(block, group)->array = ^ cfg/cfg_ctx.c:1128:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[replaced_num] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c:1180:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (CFG_GROUP_META(block, changed->group)->array != CFG_GROUP_META(*cfg_global, changed->group)->array) ^ cfg/cfg_ctx.c:1180:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[replaced_num] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c:1220:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(block, group)->array ^ cfg/cfg_ctx.c:1221:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array) ^ cfg/cfg_ctx.c:1221:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1223:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] shm_free(CFG_GROUP_META(block, group)->array); ^ cfg/cfg_ctx.c: In function 'cfg_add_group_inst': cfg/cfg_ctx.c:1577:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ cfg/cfg_ctx.c:1578:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->num++; ^ cfg/cfg_ctx.c:1580:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(*cfg_global, group)->array) { ^ cfg/cfg_ctx.c:1589:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[0] = CFG_GROUP_META(*cfg_global, group)->array; ^ cfg/cfg_ctx.c: In function 'cfg_del_group_inst': cfg/cfg_ctx.c:1673:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ cfg/cfg_ctx.c:1674:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->num--; ^ cfg/cfg_ctx.c:1676:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(*cfg_global, group)->array) { ^ cfg/cfg_ctx.c:1687:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (*(char **)(group_inst->vars + var->offset) != NULL) ^ cfg/cfg_ctx.c:1705:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (*(char **)(group_inst->vars + var->offset) != NULL) ^ cfg/cfg_ctx.c:1707:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[num] = *(char **)(group_inst->vars + var->offset); ^ cfg/cfg_ctx.c:1713:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[num] = CFG_GROUP_META(*cfg_global, group)->array; ^ ... CC (gcc) [L libsrutils.so.1.0] sha256.o sha256.c: In function 'SHA256_Final': sha256.c:613:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount; ^ sha256.c: In function 'SHA512_Last': sha256.c:930:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1]; ^ sha256.c:931:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0]; ^ --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/185

9 years, 4 months

git:master:67dfb62c: modules/ims_usrloc_scscf: only remove impurecord if there are no active subscriptions

by jaybeepee

Module: kamailio Branch: master Commit: 67dfb62cf15ab60401243c3632a587b64ed5d376 URL: https://github.com/kamailio/kamailio/commit/67dfb62cf15ab60401243c3632a587b… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-07-15T09:15:40+02:00 modules/ims_usrloc_scscf: only remove impurecord if there are no active subscriptions --- Modified: modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/67dfb62cf15ab60401243c3632a587b… Patch: https://github.com/kamailio/kamailio/commit/67dfb62cf15ab60401243c3632a587b… --- diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index fa96845..2ffb2d6 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -358,6 +358,7 @@ static inline void process_impurecord(impurecord_t* _r) { LM_DBG("DBG:registrar_timer: Subscription has dialog record in hash table with presentity uri <%.*s>\n", sub_dialog->pres_uri.len, sub_dialog->pres_uri.s); } lock_release(&sub_dialog_table[sl].lock); + mustdeleteimpu = 0; } s = s->next; } @@ -367,7 +368,6 @@ static inline void process_impurecord(impurecord_t* _r) { _r->barring, get_impu_regstate_as_string(_r->reg_state)); flag = 0; - mustdeleteimpu = 1; hascontacts = 0; num_contacts_to_expire = 0; for (k = 0; (k < _r->num_contacts) && (k < MAX_CONTACTS_PER_IMPU); k++) {

9 years, 4 months

git:master:b4079013: Merge pull request #245 from pwarnold/master

by Victor Seva

Module: kamailio Branch: master Commit: b40790134c01c6a0afa839f7896219ccff6e0818 URL: https://github.com/kamailio/kamailio/commit/b40790134c01c6a0afa839f7896219c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-15T08:55:40+02:00 Merge pull request #245 from pwarnold/master Makefile.groups was not updated when usrloc_dmq was renamed to dmq_usrloc --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/b40790134c01c6a0afa839f7896219c… Patch: https://github.com/kamailio/kamailio/commit/b40790134c01c6a0afa839f7896219c… --- diff --git a/Makefile.groups b/Makefile.groups index 54278fe..10bfdd0 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -20,7 +20,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ # - extra used modules, with no extra dependency mod_list_extra=avp auth_diameter call_control dmq domainpolicy msrp pdb \ qos sca seas sms sst timer tmrec uac_redirect xhttp \ - xhttp_rpc xprint jsonrpc-s nosip usrloc_dmq statsd rtjson + xhttp_rpc xprint jsonrpc-s nosip dmq_usrloc statsd rtjson # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

9 years, 4 months

git:master:8dcc663d: Makefile.groups: rename usrloc_dmq to dmq_usrloc

by Paul Arnold

Module: kamailio Branch: master Commit: 8dcc663d050ec314e35ed2c4bcaae592f8e39350 URL: https://github.com/kamailio/kamailio/commit/8dcc663d050ec314e35ed2c4bcaae59… Author: Paul Arnold <paul(a)barfoo.net> Committer: Paul Arnold <paul(a)barfoo.net> Date: 2015-07-15T12:10:13+10:00 Makefile.groups: rename usrloc_dmq to dmq_usrloc --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/8dcc663d050ec314e35ed2c4bcaae59… Patch: https://github.com/kamailio/kamailio/commit/8dcc663d050ec314e35ed2c4bcaae59… --- diff --git a/Makefile.groups b/Makefile.groups index 54278fe..10bfdd0 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -20,7 +20,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ # - extra used modules, with no extra dependency mod_list_extra=avp auth_diameter call_control dmq domainpolicy msrp pdb \ qos sca seas sms sst timer tmrec uac_redirect xhttp \ - xhttp_rpc xprint jsonrpc-s nosip usrloc_dmq statsd rtjson + xhttp_rpc xprint jsonrpc-s nosip dmq_usrloc statsd rtjson # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

9 years, 4 months

[kamailio] Makefile.groups was not updated when usrloc_dmq was renamed to dmq_usrloc (#245)

by Paul Arnold

Hi, Makefile.groups was not updated when usrloc_dmq was renamed to dmq_usrloc. So dmq_usrloc won't get build by default. This patch fixes that. thanks, Paul You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/245 -- Commit Summary -- * Makefile.groups: rename usrloc_dmq to dmq_usrloc -- File Changes -- M Makefile.groups (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/245.patch https://github.com/kamailio/kamailio/pull/245.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/245

9 years, 4 months

git:master:99f7d67b: dmq_usrloc: don't destroy json doc before we're done with it.

by Charles Chance

Module: kamailio Branch: master Commit: 99f7d67b20c011e78c277a44ea8cd4d6a820806f URL: https://github.com/kamailio/kamailio/commit/99f7d67b20c011e78c277a44ea8cd4d… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-07-14T22:59:10+01:00 dmq_usrloc: don't destroy json doc before we're done with it. --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/99f7d67b20c011e78c277a44ea8cd4d… Patch: https://github.com/kamailio/kamailio/commit/99f7d67b20c011e78c277a44ea8cd4d… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 20dbbf0..b826802 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -328,7 +328,6 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* LM_ERR("unrecognized field in json object\n"); } } - srjson_DestroyDoc(&jdoc); memset( &ci, 0, sizeof(ucontact_info_t)); ci.ruid = ruid; ci.c = &c; @@ -367,16 +366,19 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* default: goto invalid; } + srjson_DestroyDoc(&jdoc); resp->reason = dmq_200_rpl; resp->resp_code = 200; return 0; invalid: + srjson_DestroyDoc(&jdoc); resp->reason = dmq_400_rpl; resp->resp_code = 400; return 0; error: + srjson_DestroyDoc(&jdoc); resp->reason = dmq_500_rpl; resp->resp_code = 500; return 0;

9 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015