sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

git:master:8805959c: core: add generic byte swap macros

by Spencer Thomason

Module: kamailio Branch: master Commit: 8805959c996fce90c34e2f0bc750db172bfda0d8 URL: https://github.com/kamailio/kamailio/commit/8805959c996fce90c34e2f0bc750db1… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T01:33:29-07:00 core: add generic byte swap macros - add bswap16() and bswap32() for 16 and 32 bit endianness swap --- Modified: endianness.h --- Diff: https://github.com/kamailio/kamailio/commit/8805959c996fce90c34e2f0bc750db1… Patch: https://github.com/kamailio/kamailio/commit/8805959c996fce90c34e2f0bc750db1… --- diff --git a/endianness.h b/endianness.h index 53f0fba..e6edec2 100644 --- a/endianness.h +++ b/endianness.h @@ -30,6 +30,8 @@ * detected endianness corresponds to * the runtime detected one and -1 on * error (recommended action: bail out) + * - bswap16() - 16 bit byte swap + * - bswap32() - 32 bit byte swap * * Implementation notes: * Endian macro names/tests for different OSes: @@ -130,6 +132,29 @@ extern int endianness_sanity_check(void); #error BUG: both little & big endian detected in the same time #endif +#if defined __IS_LITTLE_ENDIAN +#include <arpa/inet.h> +#define bswap16(x) ntohs(x) +#define bswap32(x) ntohl(x) +#else /* !__IS_LITTLE_ENDIAN */ +#include <stdint.h> +#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) +/* need at least GCC 4.8 for __builtin_bswap16 on all archs */ +#define bswap16(x) ((uint16_t)__builtin_bswap16(x)) +#else +#define bswap16(x) (((uint16_t)(x) >> 8) | \ + ((uint16_t)(x) << 8)) +#endif +#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +/* GCC >= 4.3 provides __builtin_bswap32 */ +#define bswap32(x) ((uint32_t)__builtin_bswap32(x)) +#else +#define bswap32(x) (((uint32_t)(x) << 24) | \ + (((uint32_t)(x) << 8) & 0xff0000) | \ + (((uint32_t)(x) >> 8) & 0xff00) | \ + ((uint32_t)(x) >> 24)) +#endif +#endif /* !__IS_LITTLE_ENDIAN */ #endif /* _endianness_h */

8 years, 7 months

CONID and tcp:close event on outbound TCP connections

by Olle E. Johansson

Hi! Trying to debug a case where I don’t get an event_route execution for a TCP connection. IN my case, Kamailio opens a new TCP connection to another server in order to send an in-dialog request. When that connection closes, there’s no event route being executed. The tcpops module use default config, which means that the event route tcp:closed is globally enabled. I’ve been digging in the tcp code but can’t really figure it out… ;-) Cheers, /O

8 years, 7 months

[kamailio/kamailio] sipcapture/siptrace HEPv2 timestamp is endian specific (#695)

by sjthomason

I guess this is known since HEPv3 uses network byte order but I wanted to create this placeholder to try to address HEPv2 in a minimally invasive way. I first discovered this when setting up a capture server on a big endian machine with agents that are little endian. Is there a published standard for HEPv2 or would it be safe to assume that the timestamps need to be little endian? If so, maybe a quick fix is to add some macros to sipcapture and siptrace modules that are basically the reverse of ntohl. I.e. they would only reverse the byte order on big endian machines. --- 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/695

8 years, 7 months

[kamailio/kamailio] core: add generic byte swap macros (#694)

by sjthomason

- add bswap16() and bswap32() for 16 and 32 bit endianness swap You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/694 -- Commit Summary -- * core: add generic byte swap macros -- File Changes -- M endianness.h (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/694.patch https://github.com/kamailio/kamailio/pull/694.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/694

8 years, 7 months

[kamailio/kamailio] [Branch 4.4] Cannot save location after resuming a transaction that has been paused by avapi_async_relay (#622)

by Minh PHAN

Console log: ``` 9(27) INFO: <script>: preparing to resume transaction for processing: 6118 / 1144728330 / resume_auth 9(27) ERROR: <script>: Saving location 9(27) ERROR: <core> [db.c:452]: db_use_table(): invalid parameter value 9(27) ERROR: usrloc [ucontact.c:1137]: db_update_ucontact_ruid(): sql use_table failed 9(27) ERROR: usrloc [ucontact.c:1658]: update_contact_db(): failed to update database 9(27) ERROR: registrar [save.c:776]: update_contacts(): failed to update contact ``` Config script snipset: ``` route[authenticate] { if (!$aU) { xlog("REGISTER without aU = $aU"); www_challenge("$fd", "0"); exit; } evapi_async_relay("{'tindex': $T(id_index), 'tlabel': $T(id_label), 'method': 'authenticate', 'route': 'resume_auth'," "'data': { 'si': '$si', 'fU': '$fU', 'fd': '$fd', 'rU': '$rU', 'aU': '$aU', 'rd': '$rd' }" "}" ); xlog("L_INFO", "suspended transaction: $T(id_index) / $T(id_label)\n"); exit; } route[resume_auth] { xlog("Saving location\n"); if (!save("location")) { sl_reply_error(); } exit; } event_route[evapi:message-received] { xlog("received [$evapi(msg)] from $evapi(srcaddr):$evapi(srcport)\n"); jansson_get("tindex", "$evapi(msg)", "$var(tindex)"); jansson_get("tlabel", "$evapi(msg)", "$var(tlabel)"); jansson_get("route", "$evapi(msg)", "$var(next_route)"); xlog("L_INFO", "preparing to resume transaction for processing: $var(tindex) / $var(tlabel) / $var(next_route)\n"); t_continue("$var(tindex)", "$var(tlabel)", "$var(next_route)"); } ``` --- 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/622

8 years, 7 months

git:master:34f35b51: dialog: use cookie header to detect cseq auth increment needs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 34f35b51e79f4265bdfb3d654866c698bde84c01 URL: https://github.com/kamailio/kamailio/commit/34f35b51e79f4265bdfb3d654866c69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-06T16:59:32+02:00 dialog: use cookie header to detect cseq auth increment needs --- Modified: modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/34f35b51e79f4265bdfb3d654866c69… Patch: https://github.com/kamailio/kamailio/commit/34f35b51e79f4265bdfb3d654866c69… --- diff --git a/modules/dialog/dlg_cseq.c b/modules/dialog/dlg_cseq.c index 58a6bb8..be87470 100644 --- a/modules/dialog/dlg_cseq.c +++ b/modules/dialog/dlg_cseq.c @@ -35,6 +35,7 @@ #include "../../events.h" #include "../../ut.h" +#include "../../data_lump.h" #include "../../parser/parse_to.h" #include "../../parser/parse_from.h" #include "../../modules/tm/tm_load.h" @@ -188,7 +189,6 @@ int dlg_cseq_msg_sent(void *data) sip_msg_t msg; str *obuf; unsigned int direction; - tm_cell_t *t; unsigned int ninc = 0; unsigned int vinc = 0; dlg_cell_t *dlg = NULL; @@ -222,7 +222,7 @@ int dlg_cseq_msg_sent(void *data) direction = DLG_DIR_NONE; dlg = dlg_lookup_msg_dialog(&msg, &direction); - + if(dlg == NULL) { LM_DBG("no dialog for this request\n"); goto done; @@ -236,18 +236,13 @@ int dlg_cseq_msg_sent(void *data) /* check if transaction is marked for a new increment */ if(get_cseq(&msg)->method_id!=METHOD_ACK) { - t = d_tmb.t_gett(); - if(t==NULL || t==T_UNDEFINED) { - LM_DBG("no transaction for request\n"); - goto done; - } - if(t->uas.request==0) { - LM_DBG("no uas request - no cseq update needed\n"); - goto done; - } - if((t->uas.request->msg_flags&FL_UAC_AUTH)==FL_UAC_AUTH) { + if(sr_hdr_get_z(&msg, "P-K-Auth-CSeq")!=NULL) { LM_DBG("uac auth request - cseq inc needed\n"); ninc = 1; + sr_hdr_del_z(&msg, "P-K-Auth-CSeq"); + } else { + LM_DBG("uac auth request - cseq inc not needed\n"); + goto done; } }

8 years, 7 months

git:master:aaec020b: core: helper functions for header management with strz values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aaec020b5cd033a7d7821dd4a3e447405bbbecad URL: https://github.com/kamailio/kamailio/commit/aaec020b5cd033a7d7821dd4a3e4474… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-06T16:51:37+02:00 core: helper functions for header management with strz values --- Modified: data_lump.c Modified: data_lump.h --- Diff: https://github.com/kamailio/kamailio/commit/aaec020b5cd033a7d7821dd4a3e4474… Patch: https://github.com/kamailio/kamailio/commit/aaec020b5cd033a7d7821dd4a3e4474… --- diff --git a/data_lump.c b/data_lump.c index daab9aa..afd1704 100644 --- a/data_lump.c +++ b/data_lump.c @@ -734,3 +734,95 @@ int remove_lump(sip_msg_t *msg, struct lump *l) } return 0; } + +/** + * + */ +int sr_hdr_add_zz(sip_msg_t *msg, char *hname, char *hbody) +{ + struct lump* anchor; + str h; + str sname; + str sbody; + + sname.s = hname; + sname.len = strlen(sname.s); + sbody.s = hbody; + sbody.len = strlen(sbody.s); + + h.len = sname.len + 2 + sbody.len + 1 + CRLF_LEN; + h.s = (char*)pkg_malloc(h.len+1); + if(h.s == 0) { + LM_ERR("no more pkg\n"); + return -1; + } + anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); + if(anchor == 0) + { + LM_ERR("cannot get the anchor\n"); + pkg_free(h.s); + return -1; + } + memcpy(h.s, sname.s, sname.len); + memcpy(h.s+sname.len, ": ", 2); + memcpy(h.s+sname.len+2, sbody.s, sbody.len); + memcpy(h.s+sname.len+2+sbody.len+1, CRLF, CRLF_LEN); + h.s[h.len] = '\0'; + if (insert_new_lump_before(anchor, h.s, h.len, 0) == 0) + { + LM_ERR("cannot insert lump\n"); + pkg_free(h.s); + return -1; + } + LM_DBG("added new header [%s]\n", h.s); + return 0; +} + +/** + * + */ +hdr_field_t *sr_hdr_get_z(sip_msg_t *msg, char *hname) +{ + hdr_field_t *hf; + str sname; + + sname.s = hname; + sname.len = strlen(sname.s); + + for (hf=msg->headers; hf; hf=hf->next) { + if (hf->name.len==sname.len + && strncasecmp(hf->name.s, sname.s, + sname.len)==0) { + return hf; + + } + } + return NULL; +} + +/** + * + */ +int sr_hdr_del_z(sip_msg_t *msg, char *hname) +{ + hdr_field_t *hf; + struct lump* l; + str sname; + + sname.s = hname; + sname.len = strlen(sname.s); + + for (hf=msg->headers; hf; hf=hf->next) { + if (hf->name.len==sname.len + && strncasecmp(hf->name.s, sname.s, + sname.len)==0) { + l=del_lump(msg, hf->name.s-msg->buf, hf->len, 0); + if (l==0) { + LM_ERR("unable to delete cookie header\n"); + return -1; + } + return 0; + } + } + return 0; +} diff --git a/data_lump.h b/data_lump.h index 72d664b..8cdee5b 100644 --- a/data_lump.h +++ b/data_lump.h @@ -86,4 +86,9 @@ void del_nonshm_lump( struct lump** lump_list ); /*! \brief remove the lump from the internal lists */ int remove_lump(sip_msg_t *msg, struct lump *l); + +int sr_hdr_add_zz(sip_msg_t *msg, char *hname, char *hbody); +int sr_hdr_del_z(sip_msg_t *msg, char *hname); +hdr_field_t *sr_hdr_get_z(sip_msg_t *msg, char *hname); + #endif

8 years, 7 months

git:master:b0c6db1a: uac: add cookie header for cseq tracking

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b0c6db1a30b9d49f34f614d47e2bfe28b9dac62d URL: https://github.com/kamailio/kamailio/commit/b0c6db1a30b9d49f34f614d47e2bfe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-06T16:49:35+02:00 uac: add cookie header for cseq tracking - mark the request to handle it in retransmissions - GH #679 --- Modified: modules/uac/auth.c --- Diff: https://github.com/kamailio/kamailio/commit/b0c6db1a30b9d49f34f614d47e2bfe2… Patch: https://github.com/kamailio/kamailio/commit/b0c6db1a30b9d49f34f614d47e2bfe2… --- diff --git a/modules/uac/auth.c b/modules/uac/auth.c index 6a530b7..19283a5 100644 --- a/modules/uac/auth.c +++ b/modules/uac/auth.c @@ -36,6 +36,7 @@ #include "../../mem/mem.h" #include "../../hashes.h" #include "../../dset.h" +#include "../../srapi.h" #include "../../modules/tm/tm_load.h" #include "auth.h" @@ -375,7 +376,7 @@ static inline int apply_urihdr_changes( struct sip_msg *req, -int uac_auth( struct sip_msg *msg) +int uac_auth(sip_msg_t *msg) { static struct authenticate_body auth; struct uac_credential *crd; @@ -385,6 +386,7 @@ int uac_auth( struct sip_msg *msg) struct hdr_field *hdr; HASHHEX response; str *new_hdr; + sr_cfgenv_t *cenv = NULL; /* get transaction */ t = uac_tmb.t_gett(); @@ -471,7 +473,13 @@ int uac_auth( struct sip_msg *msg) /* mark request in T with uac auth for increase of cseq via dialog * - this function is executed in failure route, msg_flags will be * reset afterwards by tm fake env */ - if(t->uas.request) t->uas.request->msg_flags |= FL_UAC_AUTH; + if(t->uas.request) { + t->uas.request->msg_flags |= FL_UAC_AUTH; + cenv = sr_cfgenv_get(); + if(cenv->cseq_update == 1) { + sr_hdr_add_zz(msg, "P-K-Auth-CSeq", "yes"); + } + } return 0; error:

8 years, 7 months

git:master:cddcf1da: dialog: pass info on cseq update tracking via cfg environment

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cddcf1daa0c3747c12ed54734c1c91c0e7deefd6 URL: https://github.com/kamailio/kamailio/commit/cddcf1daa0c3747c12ed54734c1c91c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-06T16:27:08+02:00 dialog: pass info on cseq update tracking via cfg environment --- Modified: modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/cddcf1daa0c3747c12ed54734c1c91c… Patch: https://github.com/kamailio/kamailio/commit/cddcf1daa0c3747c12ed54734c1c91c… --- diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index e781708..9e9581c 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -66,6 +66,7 @@ #include "../../parser/parse_to.h" #include "../../modules/tm/tm_load.h" #include "../../rpc_lookup.h" +#include "../../srapi.h" #include "../rr/api.h" #include "dlg_hash.h" #include "dlg_timer.h" @@ -461,6 +462,7 @@ static int pv_get_dlg_count(struct sip_msg *msg, pv_param_t *param, static int mod_init(void) { unsigned int n; + sr_cfgenv_t *cenv = NULL; if(dlg_ka_interval!=0 && dlg_ka_interval<30) { LM_ERR("ka interval too low (%d), has to be at least 30\n", @@ -512,7 +514,7 @@ static int mod_init(void) } if (timeout_spec.s) { - if ( pv_parse_spec(&timeout_spec, &timeout_avp)==0 + if ( pv_parse_spec(&timeout_spec, &timeout_avp)==0 && (timeout_avp.type!=PVT_AVP)){ LM_ERR("malformed or non AVP timeout " "AVP definition in '%.*s'\n", timeout_spec.len,timeout_spec.s); @@ -704,8 +706,11 @@ static int mod_init(void) /* timer process to clean old unconfirmed dialogs */ register_sync_timers(1); - if(_dlg_track_cseq_updates!=0) + if(_dlg_track_cseq_updates!=0) { + cenv = sr_cfgenv_get(); + cenv->cseq_update = 1; dlg_register_cseq_callbacks(); + } return 0; }

8 years, 7 months

git:master:4af91169: core: structure to pass cfg env attributes between components

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4af9116951d0be9c3d042eabd632971b13df8ad1 URL: https://github.com/kamailio/kamailio/commit/4af9116951d0be9c3d042eabd632971… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-06T16:22:44+02:00 core: structure to pass cfg env attributes between components --- Modified: main.c Modified: srapi.c Modified: srapi.h --- Diff: https://github.com/kamailio/kamailio/commit/4af9116951d0be9c3d042eabd632971… Patch: https://github.com/kamailio/kamailio/commit/4af9116951d0be9c3d042eabd632971… --- diff --git a/main.c b/main.c index fc69b56..5809e12 100644 --- a/main.c +++ b/main.c @@ -19,7 +19,7 @@ * */ -/** Kamailio core :: main file (init, daemonize, startup) +/** Kamailio core :: main file (init, daemonize, startup) * @file main.c * @ingroup core * Module: core @@ -133,6 +133,7 @@ #include "async_task.h" #include "dset.h" #include "timer_proc.h" +#include "srapi.h" #ifdef DEBUG_DMALLOC #include <dmalloc.h> @@ -1836,6 +1837,7 @@ int main(int argc, char** argv) debug_flag=0; dont_fork_cnt=0; + sr_cfgenv_init(); daemon_status_init(); dprint_init_colors(); diff --git a/srapi.c b/srapi.c index a84762e..e01659b 100644 --- a/srapi.c +++ b/srapi.c @@ -44,3 +44,24 @@ sr_generate_callid_f sr_get_callid_func(void) { return _sr_generate_callid_func; } + +/** + * + */ +static sr_cfgenv_t _sr_cfgenv; + +/** + * + */ +void sr_cfgenv_init(void) +{ + memset(&_sr_cfgenv, 0, sizeof(sr_cfgenv_t)); +} + +/** + * + */ +sr_cfgenv_t* sr_cfgenv_get(void) +{ + return &_sr_cfgenv; +} diff --git a/srapi.h b/srapi.h index e0f7867..d45fe35 100644 --- a/srapi.h +++ b/srapi.h @@ -27,4 +27,11 @@ int sr_register_callid_func(sr_generate_callid_f f); sr_generate_callid_f sr_get_callid_func(void); +typedef struct sr_cfgenv { + int cseq_update; +} sr_cfgenv_t; + +void sr_cfgenv_init(void); +sr_cfgenv_t* sr_cfgenv_get(void); + #endif

8 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016