sr-dev February 2013

sr-dev@lists.kamailio.org

45 participants
200 discussions

git:pd/msrp: modules/msrp: Moved transaction ID from transaction map structure to request cache structure
by Peter Dunkley 13 Feb '13

13 Feb '13

Module: sip-router Branch: pd/msrp Commit: 09fd69af08f8bf524bb718aab3ab66af46e66fb0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09fd69a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 13 11:02:20 2013 +0000 modules/msrp: Moved transaction ID from transaction map structure to request cache structure --- modules/msrp/msrp_parser.h | 1 + modules/msrp/… [View More]msrp_tmap.c | 30 +++++++++++++++--------------- modules/msrp/msrp_tmap.h | 1 - 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/msrp/msrp_parser.h b/modules/msrp/msrp_parser.h index 4d881ee..3d7a50b 100644 --- a/modules/msrp/msrp_parser.h +++ b/modules/msrp/msrp_parser.h @@ -112,6 +112,7 @@ typedef struct msrp_hdr { typedef struct msrp_req_cache { + str transaction_id; str local_uri; str from_path; str message_id; diff --git a/modules/msrp/msrp_tmap.c b/modules/msrp/msrp_tmap.c index ac94a2d..e7fb70b 100644 --- a/modules/msrp/msrp_tmap.c +++ b/modules/msrp/msrp_tmap.c @@ -195,12 +195,12 @@ int msrp_tmap_save(msrp_frame_t *mf) memset(it, 0, msize); it->titemid = hid; - it->transactionid.s = (char*)it + + sizeof(msrp_titem_t); - it->transactionid.len = mf->fline.transaction.len; - memcpy(it->transactionid.s, mf->fline.transaction.s, mf->fline.transaction.len); - it->transactionid.s[it->transactionid.len] = '\0'; + it->req_cache.transaction_id.s = (char*)it + + sizeof(msrp_titem_t); + it->req_cache.transaction_id.len = mf->fline.transaction.len; + memcpy(it->req_cache.transaction_id.s, mf->fline.transaction.s, mf->fline.transaction.len); + it->req_cache.transaction_id.s[it->req_cache.transaction_id.len] = '\0'; - it->req_cache.local_uri.s = it->transactionid.s + it->transactionid.len + 1; + it->req_cache.local_uri.s = it->req_cache.transaction_id.s + it->req_cache.transaction_id.len + 1; it->req_cache.local_uri.len = local_uri.len; memcpy(it->req_cache.local_uri.s, local_uri.s, local_uri.len); it->req_cache.local_uri.s[it->req_cache.local_uri.len] = '\0'; @@ -336,7 +336,7 @@ int msrp_tmap_lookup(msrp_frame_t *mf) return -2; } - LM_DBG("searching for transaction [%.*s]\n", tid->len, tid->s); + LM_ERR("searching for transaction [%.*s]\n", tid->len, tid->s); hid = msrp_get_hashid(tid); idx = msrp_get_slot(hid, _msrp_tmap_head->mapsize); @@ -347,9 +347,9 @@ int msrp_tmap_lookup(msrp_frame_t *mf) if(itb->titemid>hid) { break; } else { - if(itb->transactionid.len == tid->len - && memcmp(itb->transactionid.s, tid->s, tid->len)==0) { - LM_DBG("found transaction [%.*s]\n", tid->len, tid->s); + if(itb->req_cache.transaction_id.len == tid->len + && memcmp(itb->req_cache.transaction_id.s, tid->s, tid->len)==0) { + LM_ERR("found transaction [%.*s]\n", tid->len, tid->s); mf->req_cache = pkg_copy_req_cache(&itb->req_cache); break; } @@ -375,11 +375,11 @@ int msrp_tmap_del(msrp_frame_t *mf) return -1; if(mf->fline.msgtypeid==MSRP_REQUEST) { - LM_DBG("lookup cannot be used for requests\n"); + LM_DBG("del cannot be used for requests\n"); return -2; } - LM_DBG("searching for transaction [%.*s]\n", tid->len, tid->s); + LM_ERR("searching for transaction [%.*s]\n", tid->len, tid->s); hid = msrp_get_hashid(tid); idx = msrp_get_slot(hid, _msrp_tmap_head->mapsize); @@ -390,9 +390,9 @@ int msrp_tmap_del(msrp_frame_t *mf) if(itb->titemid>hid) { break; } else { - if(itb->transactionid.len == tid->len - && memcmp(itb->transactionid.s, tid->s, tid->len)==0) { - LM_DBG("found transaction [%.*s]\n", tid->len, tid->s); + if(itb->req_cache.transaction_id.len == tid->len + && memcmp(itb->req_cache.transaction_id.s, tid->s, tid->len)==0) { + LM_ERR("found transaction [%.*s]\n", tid->len, tid->s); msrp_titem_free(itb); break; } @@ -539,7 +539,7 @@ static void msrp_tmap_rpc_list(rpc_t* rpc, void* ctx) edate.len = 24; if(rpc->struct_add(vh, "dSSSSSS", "TITEMID", it->titemid, - "TRANSACTIONID", &it->transactionid, + "TRANSACTIONID", &it->req_cache.transaction_id, "LOCALURI", &it->req_cache.local_uri, "FROMPATH", &it->req_cache.from_path, "MESSAGEID", &it->req_cache.message_id, diff --git a/modules/msrp/msrp_tmap.h b/modules/msrp/msrp_tmap.h index ede8de0..ec51c1e 100644 --- a/modules/msrp/msrp_tmap.h +++ b/modules/msrp/msrp_tmap.h @@ -33,7 +33,6 @@ typedef struct _msrp_titem { unsigned int titemid; - str transactionid; msrp_req_cache_t req_cache; time_t expires; struct _msrp_titem *prev; [View Less]

1 0

git:pd/msrp: modules/msrp: Fixed typo in diagnostic
by Peter Dunkley 13 Feb '13

13 Feb '13

Module: sip-router Branch: pd/msrp Commit: 82440b117b628e8ae98a7d6c639875eba7d8169d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82440b1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 13 10:59:53 2013 +0000 modules/msrp: Fixed typo in diagnostic --- modules/msrp/msrp_cmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/msrp/… [View More]

1 0

git:master: xhttp_pi: remove unused variable
by Ovidiu Sas 12 Feb '13

12 Feb '13

Module: sip-router Branch: master Commit: 8066d290b69a472fc46df248ae861487c932f738 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8066d29… Author: Ovidiu Sas <osas(a)ubuntu.(none)> Committer: Ovidiu Sas <osas(a)ubuntu.(none)> Date: Tue Feb 12 15:13:05 2013 -0500 xhttp_pi: remove unused variable --- modules/xhttp_pi/xhttp_pi_fnc.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/xhttp_pi/xhttp_pi_fnc.c b/… [View More]

1 0

git:master: xhttp_pi: remove unused variable
by Ovidiu Sas 12 Feb '13

12 Feb '13

Module: sip-router Branch: master Commit: 36d0763385605c8174a538297dd8dfa94092e9c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36d0763… Author: Ovidiu Sas <osas(a)ubuntu.(none)> Committer: Ovidiu Sas <osas(a)ubuntu.(none)> Date: Tue Feb 12 14:38:53 2013 -0500 xhttp_pi: remove unused variable --- modules/xhttp_pi/xhttp_pi_fnc.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/xhttp_pi/xhttp_pi_fnc.c b/modules/… [View More]

1 0

Memory leak in MSRP
by Peter Dunkley 12 Feb '13

12 Feb '13

Hello, There is an msrp_free_frame() function, which in turn calls msrp_destroy_frame(). These functions free up package memory allocated for MSRP frames. However, I can't find where msrp_free_frame() is called. Should msrp_free_frame() be called, and if so where? Regards, Peter

2 3

git:pd/msrp: modules/msrp: Added transaction map to enable generation of failure REPORTs in response to failure replies
by Peter Dunkley 12 Feb '13

12 Feb '13

Module: sip-router Branch: pd/msrp Commit: 6676ff6b983cc3b790e8570c77738f26de537ee8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6676ff6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Feb 12 17:25:19 2013 +0000 modules/msrp: Added transaction map to enable generation of failure REPORTs in response to failure replies - Also created new event_route[] for REPORTing … [View More]

1 0

Problem with $msrp(code) PV
by Peter Dunkley 12 Feb '13

12 Feb '13

I am having strange behaviour with $msrp(code). The following config. fragment: if (msrp_is_reply()) { xlog("Code: $msrp(code)\n"); if ($msrp(code) < 300) { xlog("Received OK MSRP reply\n"); } else { xlog("Received failure MSRP reply\n"); } Produces the following output: Feb 6 15:55:02 blade14 /usr/sbin/kamailio[3831]: ERROR: <script>: Code: 200 … [View More]

3 7

Re: [sr-dev] [SR-Users] openser db on an external mysql server
by Prakash N 12 Feb '13

12 Feb '13

Hi Shahzad , It is not ,We can able to connect remote mysql ( please find the detail below),moreover we can able create openser db from Kamailio server to remote mysql server *Mysql server : 192.168.1.170* *Kamailio server : 192.168.1.101* *Mysql output :* * * *mysql -u openser -h 192.168.1.170 -p* Enter password: Welcome to the MySQL monitor. Commands end with ; or \g. Your MySQL connection id is 68 Server version: 5.1.67 Source distribution Copyright (c) 2000, 2012, Oracle and/… [View More]or its affiliates. All rights reserved. Oracle is a registered trademark of Oracle Corporation and/or its affiliates. Other names may be trademarks of their respective owners. Type 'help;' or '\h' for help. Type '\c' to clear the current input statement. mysql> With Regards N.Prakash > > ---------- Forwarded message ---------- > From: Muhammad Shahzad <shaheryarkh(a)gmail.com> > Date: Tue, Feb 12, 2013 at 5:16 PM > Subject: Re: [sr-dev] [SR-Users] openser db on an external mysql server > To: Development mailing list of the sip-router project < > sr-dev(a)lists.sip-router.org> > Cc: Daniel-Constantin Mierla <miconda(a)gmail.com>, > sr-users(a)lists.sip-router.org, Indu Priya <indu(a)tevatel.com>, Prabhakaran > B <prabhakaran(a)tevatel.com> > > > Its not a Kamailio error, it is problem with connecting to mysql server. > Error 4 means No MySQL Server Running On Specified Host. > > May be MySQL server is down or there is some firewall running or MySQL not > listening on IP you specified. > > Thank you. > > > On Tue, Feb 12, 2013 at 12:11 PM, Prakash N <prakash.n(a)tevatel.com> wrote: > >> Dear Daniel, >> >> Thanks for your quick response >> >> We can able to create operseb db on remote mysql server ,but >> Kamailio not getting start >> >> Error detail: >> >> ERROR: db_mysql [km_my_con.c:109]: driver error: Can't connect to MySQL >> server on '192.168.1.170' (4) >> ERROR: <core> [db.c:32 0]: could not add connection to the pool >> ERROR: auth_db [authdb _mod.c:174]: unable to connect to the database >> ERROR: <core> [sr_modu le.c:896]: init_mod_child(): Error while >> initializing module auth_db (/usr/local/lib64/kamailio/modules_k/auth_db.so) >> >> >> I have attached my kamailo.cfg ( we followed Kamailio and Asterisk real >> time installation) ,please advice >> >> With Regards >> >> N.Prakash >> >>> >>> ---------- Forwarded message ---------- >>> From: Daniel-Constantin Mierla <miconda(a)gmail.com> >>> Date: Tue, Feb 12, 2013 at 2:41 PM >>> Subject: Re: [SR-Users] openser db on an external mysql server >>> To: "SIP Router - Kamailio (OpenSER) and SIP Express Router (SER) - >>> Users Mailing List" <sr-users(a)lists.sip-router.org>, >>> sr-dev(a)lists.sip-router.org, miconda(a)gmail.com >>> Cc: Prabhakaran B <prabhakaran(a)tevatel.com> >>> >>> >>> Hello, >>> >>> kamailio database is created with: >>> >>> kamdbctl create >>> >>> the host of mysql server has to be specified in kamctlrc file via DBHOST >>> variable - kamctlrc is located in same directory as kamailio.cfg. >>> >>> In kamailio.cfg, update the db_url value (or DBURL define) to reflect >>> the mysql server host. >>> >>> Cheers, >>> Daniel >>> >>> >>> On 2/12/13 4:16 AM, Prakash N wrote: >>> >>> Hi All, >>> >>> I am new this Kamailo ,ther is any step by step document to set >>> up openser db on an external mysql server ? >>> >>> With Regards >>> >>> N.Prakash >>> >>> >>> >>> _______________________________________________ >>> SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing listsr-users@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users >>> >>> >>> >>> -- >>> Daniel-Constantin Mierla - http://www.asipto.comhttp://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda >>> Kamailio World Conference, April 16-17, 2013, Berlin >>> - http://conference.kamailio.com - >>> >>> >>> >> >> _______________________________________________ >> sr-dev mailing list >> sr-dev(a)lists.sip-router.org >> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev >> >> > > > -- > Muhammad Shahzad > ----------------------------------- > CISCO Rich Media Communication Specialist (CRMCS) > CISCO Certified Network Associate (CCNA) > Cell: +49 176 99 83 10 85 > MSN: shari_786pk(a)hotmail.com > Email: shaheryarkh(a)googlemail.com > > [View Less]

3 3

Re: [sr-dev] [SR-Users] openser db on an external mysql server
by Prakash N 12 Feb '13

12 Feb '13

Dear Daniel, Thanks for your quick response We can able to create operseb db on remote mysql server ,but Kamailio not getting start Error detail: ERROR: db_mysql [km_my_con.c:109]: driver error: Can't connect to MySQL server on '192.168.1.170' (4) ERROR: <core> [db.c:32 0]: could not add connection to the pool ERROR: auth_db [authdb _mod.c:174]: unable to connect to the database ERROR: <core> [sr_modu le.c:896]: init_mod_child(): Error while initializing … [View More]

2 1

git:pd/msrp: Merge branch 'master' into msrp
by Peter Dunkley 12 Feb '13

12 Feb '13

Module: sip-router Branch: pd/msrp Commit: 5964e0bc761bbf1c2db57cde2e3db1339b951422 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5964e0b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Feb 12 11:10:56 2013 +0000 Merge branch 'master' into msrp * master: modules:sipcapture fixed LM_ERR. Sorry :-( msrp: return proper value for $msrp(code) ---

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2013