sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:68ca030d: Fix contacts sync
by Andrey Rybkin 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: 68ca030d02f1db0006294c9b227dd4f4d319d39e URL: https://github.com/kamailio/kamailio/commit/68ca030d02f1db0006294c9b227dd4f… Author: Andrey Rybkin <rybkin.a(a)bks.tv> Committer: Andrey Rybkin <rybkin.a(a)bks.tv> Date: 2014-12-24T16:16:35+03:00 Fix contacts sync --- Modified: modules/usrloc_dmq/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/68ca030d02f1db0006294c9b227dd4f… Patch: https://github.com/kamailio/kamailio/commit/68ca030d02f1db0006294c9b227dd4f… --- diff --git a/modules/usrloc_dmq/usrloc_sync.c b/modules/usrloc_dmq/usrloc_sync.c index e284b5b..3f049ff 100644 --- a/modules/usrloc_dmq/usrloc_sync.c +++ b/modules/usrloc_dmq/usrloc_sync.c @@ -148,57 +148,57 @@ void usrloc_get_all_ucontact(dmq_node_t* node) if (buf == NULL) goto done; cp = buf; - while (1) { - memcpy(&(c.len), cp, sizeof(c.len)); - if (c.len == 0) - break; - c.s = (char*)cp + sizeof(c.len); - cp = (char*)cp + sizeof(c.len) + c.len; - memcpy( &send_sock, cp, sizeof(send_sock)); - cp = (char*)cp + sizeof(send_sock); - memcpy( &flags, cp, sizeof(flags)); - cp = (char*)cp + sizeof(flags); - memcpy( &(path.len), cp, sizeof(path.len)); - path.s = path.len ? ((char*)cp + sizeof(path.len)) : NULL ; - cp = (char*)cp + sizeof(path.len) + path.len; - memcpy( &(ruid.len), cp, sizeof(ruid.len)); - ruid.s = ruid.len ? ((char*)cp + sizeof(ruid.len)) : NULL ; - cp = (char*)cp + sizeof(ruid.len) + ruid.len; - memcpy( &aorhash, cp, sizeof(aorhash)); - cp = (char*)cp + sizeof(aorhash); - - - str aor; - sip_uri_t puri; - urecord_t* r; - udomain_t* _d; - ucontact_t* ptr = 0; - int res; - - if (extract_aor(&c, &aor, &puri) < 0) { - LM_ERR("failed to extract address of record\n"); - continue; - } - ul.get_udomain("location", &_d); - ul.lock_udomain(_d, &aor); - res = ul.get_urecord(_d, &aor, &r); - if (res > 0) { - LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); - ul.unlock_udomain(_d, &aor); - continue; - } - - LM_DBG("- AoR: %.*s AoRhash=%d Flags=%d\n", aor.len, aor.s, aorhash, flags); - - ptr = r->contacts; - - while (ptr) { - usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, node); - ptr = ptr->next; - } - ul.release_urecord(r); - ul.unlock_udomain(_d, &aor); - } + while (1) { + memcpy(&(c.len), cp, sizeof(c.len)); + if (c.len == 0) + break; + c.s = (char*)cp + sizeof(c.len); + cp = (char*)cp + sizeof(c.len) + c.len; + memcpy( &send_sock, cp, sizeof(send_sock)); + cp = (char*)cp + sizeof(send_sock); + memcpy( &flags, cp, sizeof(flags)); + cp = (char*)cp + sizeof(flags); + memcpy( &(path.len), cp, sizeof(path.len)); + path.s = path.len ? ((char*)cp + sizeof(path.len)) : NULL ; + cp = (char*)cp + sizeof(path.len) + path.len; + memcpy( &(ruid.len), cp, sizeof(ruid.len)); + ruid.s = ruid.len ? ((char*)cp + sizeof(ruid.len)) : NULL ; + cp = (char*)cp + sizeof(ruid.len) + ruid.len; + memcpy( &aorhash, cp, sizeof(aorhash)); + cp = (char*)cp + sizeof(aorhash); + + + str aor; + sip_uri_t puri; + urecord_t* r; + udomain_t* _d; + ucontact_t* ptr = 0; + + int res; + + if (extract_aor(&c, &aor, &puri) < 0) { + LM_ERR("failed to extract address of record\n"); + continue; + } + ul.get_udomain("location", &_d); + + res = ul.get_urecord_by_ruid(_d, aorhash, &ruid, &r, &ptr); + aor = r->aor; + if (res > 0) { + LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); + ul.release_urecord(r); + ul.unlock_udomain(_d, &aor); + continue; + } + LM_DBG("- AoR: %.*s AoRhash=%d Flags=%d\n", aor.len, aor.s, aorhash, flags); + + while (ptr) { + usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, node); + ptr = ptr->next; + } + ul.release_urecord(r); + ul.unlock_udomain(_d, &aor); + } pkg_free(buf); done:

1 0

git:master:6f9e5bea: Set tcpconn_id to -1 for records added via dmq
by Andrey Rybkin 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: 6f9e5bea2aa1dcbf1944e54f17c4e9fd9088201e URL: https://github.com/kamailio/kamailio/commit/6f9e5bea2aa1dcbf1944e54f17c4e9f… Author: Andrey Rybkin <rybkin.a(a)bks.tv> Committer: Andrey Rybkin <rybkin.a(a)bks.tv> Date: 2014-12-24T12:30:33+03:00 Set tcpconn_id to -1 for records added via dmq --- Modified: modules/usrloc_dmq/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/6f9e5bea2aa1dcbf1944e54f17c4e9f… Patch: https://github.com/kamailio/kamailio/commit/6f9e5bea2aa1dcbf1944e54f17c4e9f… --- diff --git a/modules/usrloc_dmq/usrloc_sync.c b/modules/usrloc_dmq/usrloc_sync.c index cffd7f2..e284b5b 100644 --- a/modules/usrloc_dmq/usrloc_sync.c +++ b/modules/usrloc_dmq/usrloc_sync.c @@ -263,7 +263,7 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* srjson_t *it = NULL; static ucontact_info_t ci; - int action, expires, cseq, flags, cflags, q, last_modified, methods, reg_id, tcpconn_id; + int action, expires, cseq, flags, cflags, q, last_modified, methods, reg_id; str aor, ruid, c, received, path, callid, user_agent, instance; parse_from_header(msg); @@ -346,8 +346,6 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* methods = it->valueint; } else if (strcmp(it->string, "reg_id")==0) { reg_id = it->valueint; - } else if (strcmp(it->string, "tcpconn_id")==0) { - tcpconn_id = it->valueint; } else { LM_ERR("unrecognized field in json object\n"); } @@ -369,7 +367,7 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* ci.methods = methods; ci.instance = instance; ci.reg_id = reg_id; - ci.tcpconn_id = tcpconn_id; + ci.tcpconn_id = -1; ci.last_modified = last_modified; switch(action) { @@ -477,8 +475,7 @@ int usrloc_dmq_send_contact(ucontact_t* ptr, str aor, int action, dmq_node_t* no srjson_AddNumberToObject(&jdoc, jdoc.root, "last_modified", ptr->last_modified); srjson_AddNumberToObject(&jdoc, jdoc.root, "methods", ptr->methods); srjson_AddNumberToObject(&jdoc, jdoc.root, "reg_id", ptr->reg_id); - srjson_AddNumberToObject(&jdoc, jdoc.root, "tcpconn_id", ptr->tcpconn_id); - + jdoc.buf.s = srjson_PrintUnformatted(&jdoc, jdoc.root); if(jdoc.buf.s==NULL) { LM_ERR("unable to serialize data\n");

1 0

git:master:3b1b8843: Update Makefile
by Andrey Rybkin 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: 3b1b8843fc2e6096e63d5040e3fb037d98aa55b3 URL: https://github.com/kamailio/kamailio/commit/3b1b8843fc2e6096e63d5040e3fb037… Author: Andrey Rybkin <rybkin.a(a)bks.tv> Committer: Andrey Rybkin <rybkin.a(a)bks.tv> Date: 2014-12-24T12:01:59+03:00 Update Makefile --- Modified: modules/usrloc_dmq/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3b1b8843fc2e6096e63d5040e3fb037… Patch: https://github.com/kamailio/kamailio/commit/3b1b8843fc2e6096e63d5040e3fb037… --- diff --git a/modules/usrloc_dmq/Makefile b/modules/usrloc_dmq/Makefile index 95ffd81..443fe44 100644 --- a/modules/usrloc_dmq/Makefile +++ b/modules/usrloc_dmq/Makefile @@ -5,8 +5,5 @@ NAME=usrloc_dmq.so DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/kmi/kmi -SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 -SER_LIBS+=$(SERLIBPATH)/kcore/kcore SER_LIBS+=$(SERLIBPATH)/srutils/srutils include ../../Makefile.modules

1 0

Re: [sr-dev] [kamailio] usrloc_dmq: add module for usrloc sync via dmq (#3)
by Daniel-Constantin Mierla 03 Jan '15

03 Jan '15

Merged #3. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3#event-213701461

1 0

git:master:e5d96118: Add module for usrloc sync via dmq
by Andrey Rybkin 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: e5d9611884187952f7e05f3ee191320c5123c463 URL: https://github.com/kamailio/kamailio/commit/e5d9611884187952f7e05f3ee191320… Author: Andrey Rybkin <rybkin.a(a)bks.tv> Committer: Andrey Rybkin <rybkin.a(a)bks.tv> Date: 2014-11-14T10:06:19+03:00 Add module for usrloc sync via dmq --- Added: modules/usrloc_dmq/Makefile Added: modules/usrloc_dmq/doc/Makefile Added: modules/usrloc_dmq/doc/usrloc_dmq.xml Added: modules/usrloc_dmq/doc/usrloc_dmq_admin.xml Added: modules/usrloc_dmq/usrloc_dmq.c Added: modules/usrloc_dmq/usrloc_sync.c Added: modules/usrloc_dmq/usrloc_sync.h --- Diff: https://github.com/kamailio/kamailio/commit/e5d9611884187952f7e05f3ee191320… Patch: https://github.com/kamailio/kamailio/commit/e5d9611884187952f7e05f3ee191320…

1 0

Re: [sr-dev] [kamailio] usrloc_dmq: add module for usrloc sync via dmq (#3)
by Daniel-Constantin Mierla 03 Jan '15

03 Jan '15

I will merge this. There are few things to be sorted out in short term: - variables to be declared at the beginning of functions or blocks, to be sure it still compiles with old strict C compilers - add license at the top of the c/h files - it must be GPLv2 or BSD, at your choice We will grant you direct commit access to main kamailio repository, so you can push those updates directly. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3#issuecomment-68607889

1 0

git:master:03dfde0f: usrloc Remove SVN id, remove history
by Olle E. Johansson 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: 03dfde0fd7b24ab943b3929922573dc27fd41fb8 URL: https://github.com/kamailio/kamailio/commit/03dfde0fd7b24ab943b3929922573dc… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-03T17:48:16+01:00 usrloc Remove SVN id, remove history --- Modified: modules/usrloc/dlist.c Modified: modules/usrloc/dlist.h Modified: modules/usrloc/hslot.c Modified: modules/usrloc/hslot.h Modified: modules/usrloc/ucontact.c Modified: modules/usrloc/ucontact.h Modified: modules/usrloc/udomain.c Modified: modules/usrloc/udomain.h Modified: modules/usrloc/ul_callback.c Modified: modules/usrloc/ul_callback.h Modified: modules/usrloc/ul_mi.c Modified: modules/usrloc/ul_mi.h Modified: modules/usrloc/ul_mod.c Modified: modules/usrloc/ul_mod.h Modified: modules/usrloc/ul_rpc.c Modified: modules/usrloc/ul_rpc.h Modified: modules/usrloc/urecord.c Modified: modules/usrloc/urecord.h Modified: modules/usrloc/usrloc.c Modified: modules/usrloc/usrloc.h Modified: modules/usrloc/utime.c Modified: modules/usrloc/utime.h --- Diff: https://github.com/kamailio/kamailio/commit/03dfde0fd7b24ab943b3929922573dc… Patch: https://github.com/kamailio/kamailio/commit/03dfde0fd7b24ab943b3929922573dc…

1 0

Code clean up - history and svn $id$
by Olle E. Johansson 03 Jan '15

03 Jan '15

Hi! While going through the core files, I noted that some of the history messages - typically the first line or two - has important information about the content of the file, which is not always copied into the Doxygen. Each file should have a doxygen declaration, like: /*! * \file * \brief Kamailio core :: <description of this file> * \ingroup core * Module: \ref core */ Please make sure that you preserve the file information. You can add a few lines of description that you find elsewhere to the block, like: /*! * \file * \brief Kamailio core :: Gnurging the smorifians * The smorifians are dangerous parts of a SIP message and needs to be gnurged. This * code file handles 94.25% of these cases. If you find out how to complete the process, * please add new functions. * \ingroup core * Module: \ref core */ You may also add * \author Gonzilla the IIIrd, emperor of GowarkiStania <gonzilla(a)gowarkistania.skrep> To this section if you find an author or multiple ones. Doxygen for Kamailio is generated here: http://sip-router.org/doxygen/sip-router/branch/master/ I did also change any text saying "ser" or "sip-router" to "Kamailio" while I was in the file changing text in comments. Doxygen is cool and very helpful for new developers that wants to find their way around Kamailio source code. /Olle

2 1

git:master:f1b15228: tm Remove svn ID, remove history, rename "ser" to "kamailio"
by Olle E. Johansson 03 Jan '15

03 Jan '15

Module: kamailio Branch: master Commit: f1b15228b7de594cf9fa7b1f2cebc3834adf9628 URL: https://github.com/kamailio/kamailio/commit/f1b15228b7de594cf9fa7b1f2cebc38… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-03T16:48:29+01:00 tm Remove svn ID, remove history, rename "ser" to "kamailio" --- Modified: modules/tm/callid.c Modified: modules/tm/callid.h Modified: modules/tm/config.c Modified: modules/tm/config.h Modified: modules/tm/defs.h Modified: modules/tm/dlg.c Modified: modules/tm/dlg.h Modified: modules/tm/h_table.c Modified: modules/tm/h_table.h Modified: modules/tm/lock.c Modified: modules/tm/lock.h Modified: modules/tm/lw_parser.c Modified: modules/tm/lw_parser.h Modified: modules/tm/rpc_uac.c Modified: modules/tm/rpc_uac.h Modified: modules/tm/select.c Modified: modules/tm/select.h Modified: modules/tm/sip_msg.c Modified: modules/tm/sip_msg.h Modified: modules/tm/t_append_branches.c Modified: modules/tm/t_append_branches.h Modified: modules/tm/t_cancel.c Modified: modules/tm/t_cancel.h Modified: modules/tm/t_fifo.c Modified: modules/tm/t_fifo.h Modified: modules/tm/t_funcs.c Modified: modules/tm/t_funcs.h Modified: modules/tm/t_fwd.c Modified: modules/tm/t_fwd.h Modified: modules/tm/t_hooks.c Modified: modules/tm/t_hooks.h Modified: modules/tm/t_lookup.c Modified: modules/tm/t_lookup.h Modified: modules/tm/t_msgbuilder.c Modified: modules/tm/t_msgbuilder.h Modified: modules/tm/t_reply.c Modified: modules/tm/t_reply.h Modified: modules/tm/t_serial.c Modified: modules/tm/t_serial.h Modified: modules/tm/t_stats.c Modified: modules/tm/t_stats.h Modified: modules/tm/t_suspend.c Modified: modules/tm/t_suspend.h Modified: modules/tm/test.c Modified: modules/tm/timer.c Modified: modules/tm/timer.h Modified: modules/tm/tm.c Modified: modules/tm/tm_load.c Modified: modules/tm/tm_load.h Modified: modules/tm/uac.c Modified: modules/tm/uac.h Modified: modules/tm/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/f1b15228b7de594cf9fa7b1f2cebc38… Patch: https://github.com/kamailio/kamailio/commit/f1b15228b7de594cf9fa7b1f2cebc38…

1 0

Jiri's source memorial
by Olle E. Johansson 03 Jan '15

03 Jan '15

For all of you that haven't dared digging into the source code of the TM module. Beware - it's a dangerous place: * *************************************************** * * Jiri's Source Memorial * * * * * * Welcome, pilgrim ! This is the greatest place * * * where dramatic changes happend. There are not * * * many places with a history like this, as there * * * are not so many people like Jiri, one of the * * * ser's fathers, who brought everywhere the wind * * * of change, the flood of clean-up. We all felt * * * his fatherly eye watching over us day and night.* * * * * * Please, preserve this codework heritage, as * * * it's unlikely for fresh, juicy pieces of code to * * * arise to give him the again the chance to * * * demonstrate his clean-up and improvement skills.* * * * * * Hereby, we solicit you to adopt this historical * * * piece of code. For $100, your name will be * * * be printed in this banner and we will use * * * collected funds to create and display an ASCII * * * statue of Jiri . * * *************************************************** /O :-)

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 January 2015