sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

[ openser-Support Requests-3429000 ] Asterisk 1.8 + Kamailio 1.5

by SourceForge.net

Support Requests item #3429000, was opened at 2011-10-26 23:58 Message generated for change (Tracker Item Submitted) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743021&aid=3429000&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: core Group: ver devel Status: Open Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: Asterisk 1.8 + Kamailio 1.5 Initial Comment: Hi, We are having issues where the "OK" or "ACK" is that is coming from the phone is not relayed by OpenSER to Asterisk. Below is the sip trace... I am also attaching a tcpdump. Please help what we can do. Received from udp:10.1.10.80:5060 at 26/10/2011 10:22:41:476 (490 bytes): SIP/2.0 481 Call/Transaction Does Not Exist Via: SIP/2.0/UDP 10.30.0.64:5060;received=10.30.0.64;branch=z9hG4bK-wowp1kmdy4rl;rport=5060 From: "Virgil Menendez" <sip:91421@ser.gowireless.net>;tag=6wkdms1r20 To: <sip:9513261429@ser.gowireless.net;user=phone>;tag=as0b87218f Call-ID: 3c26755bf15c-9iq08xqqblo6 CSeq: 4 INVITE Server: Asterisk PBX 1.8.7.1 Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH Supported: replaces, timer Content-Length: 0 -------------------------------------------------------------------------------- Sent to udp:10.1.10.80:5060 at 26/10/2011 10:22:41:481 (387 bytes): ACK sip:vm9513261429@10.1.10.83:5060 SIP/2.0 v: SIP/2.0/UDP 10.30.0.64:5060;branch=z9hG4bK-wowp1kmdy4rl;rport Route: <sip:10.1.10.80;lr=on> f: "Virgil Menendez" <sip:91421@ser.gowireless.net>;tag=6wkdms1r20 t: <sip:9513261429@ser.gowireless.net;user=phone>;tag=as0b87218f i: 3c26755bf15c-9iq08xqqblo6 CSeq: 4 ACK Max-Forwards: 70 m: <sip:91421@10.30.0.64:5060>;reg-id=1 l: 0 -------------------------------------------------------------------------------- Received from udp:10.1.10.80:5060 at 26/10/2011 10:22:42:130 (868 bytes): SIP/2.0 200 OK Via: SIP/2.0/UDP 10.30.0.64:5060;received=10.30.0.64;branch=z9hG4bK-5evtiw6dm0po;rport=5060 Record-Route: <sip:10.1.10.80;lr=on> From: "Virgil Menendez" <sip:91421@ser.gowireless.net>;tag=qi3i8ze6z8 To: <sip:9513261429@ser.gowireless.net;user=phone>;tag=as3f8c0f96 Call-ID: 3c2676547a8d-2t5yi6jok1sv CSeq: 2 INVITE Server: Asterisk PBX 1.8.7.1 Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH Supported: replaces, timer Session-Expires: 1800;refresher=uas Contact: <sip:9513261429@10.1.10.83:5060> Content-Type: application/sdp Content-Length: 256 v=0 o=root 1355451627 1355451627 IN IP4 10.1.10.83 s=Asterisk PBX 1.8.7.1 c=IN IP4 10.1.10.83 t=0 0 m=audio 16094 RTP/AVP 0 8 101 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=ptime:20 a=sendrecv -------------------------------------------------------------------------------- Sent to udp:10.1.10.80:5060 at 26/10/2011 10:22:42:132 (385 bytes): ACK sip:9513261429@10.1.10.83:5060 SIP/2.0 v: SIP/2.0/UDP 10.30.0.64:5060;branch=z9hG4bK-wszafb7cbzpw;rport Route: <sip:10.1.10.80;lr=on> f: "Virgil Menendez" <sip:91421@ser.gowireless.net>;tag=qi3i8ze6z8 t: <sip:9513261429@ser.gowireless.net;user=phone>;tag=as3f8c0f96 i: 3c2676547a8d-2t5yi6jok1sv CSeq: 2 ACK Max-Forwards: 70 m: <sip:91421@10.30.0.64:5060>;reg-id=1 l: 0 -------------------------------------------------------------------------------- Received from udp:10.1.10.80:5060 at 26/10/2011 10:22:42:232 (503 bytes): BYE sip:91421@10.30.0.64:5060 SIP/2.0 Via: SIP/2.0/UDP 10.1.10.80;branch=z9hG4bKe723.bf70c1f4.0 Via: SIP/2.0/UDP 10.1.10.83:5060;branch=z9hG4bK69f53cf1 Max-Forwards: 69 From: <sip:9513261429@ser.gowireless.net;user=phone>;tag=as3f8c0f96 To: "Virgil Menendez" <sip:91421@ser.gowireless.net>;tag=qi3i8ze6z8 Call-ID: 3c2676547a8d-2t5yi6jok1sv CSeq: 102 BYE User-Agent: Asterisk PBX 1.8.7.1 X-Asterisk-HangupCause: Protocol error, unspecified X-Asterisk-HangupCauseCode: 111 Content-Length: 0 Regards, Rowell ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743021&aid=3429000&group_…

12 years, 6 months

git:3.2: dispatcher(k): clarified notes about probing mode

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.2 Commit: 7c241cea37d31313949bf252ddb063a36c8f1436 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c241ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 26 18:59:39 2011 +0200 dispatcher(k): clarified notes about probing mode (cherry picked from commit 9056b574f3df2d3358c3e726772d63bbbcd6dc23) --- modules_k/dispatcher/README | 390 +++++++++++++------------ modules_k/dispatcher/doc/dispatcher_admin.xml | 74 +++--- 2 files changed, 237 insertions(+), 227 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7c2…

12 years, 6 months

git:3.2: dispatcher(k): restore actve state via MI

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.2 Commit: 4bdb5ecc0853968f55cc6fadf12ed05b47c39fdc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bdb5ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 20 23:50:08 2011 +0200 dispatcher(k): restore actve state via MI - resetting the state flags were not in effect for active state, reported by Asgaroth - added define to check whether a destionation addres should be skipped or not based on its state (cherry picked from commit 25bedcd991bc0225c50467abf0b6e48618893cbf) --- modules_k/dispatcher/dispatch.c | 32 ++++++++++++++++++-------------- modules_k/dispatcher/dispatch.h | 3 +++ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 9bb942a..3049adc 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1221,8 +1221,7 @@ int ds_get_leastloaded(ds_set_t *dset) t = dset->dlist[k].dload; for(j=1; j<dset->nr; j++) { - if(!((dset->dlist[j].flags & DS_INACTIVE_DST) - || (dset->dlist[j].flags & DS_PROBING_DST))) + if(!ds_skip_dst(dset->dlist[j].flags & DS_PROBING_DST)) { if(dset->dlist[j].dload<t) { @@ -1692,8 +1691,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) else hash = hash%idx->nr; i=hash; - while ((idx->dlist[i].flags & DS_INACTIVE_DST) - || (idx->dlist[i].flags & DS_PROBING_DST)) + while (ds_skip_dst(idx->dlist[i].flags)) { if(ds_use_default!=0 && idx->nr!=1) i = (i+1)%(idx->nr-1); @@ -1705,8 +1703,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) if(ds_use_default!=0) { i = idx->nr-1; - if((idx->dlist[i].flags & DS_INACTIVE_DST) - || (idx->dlist[i].flags & DS_PROBING_DST)) + if(ds_skip_dst(idx->dlist[i].flags)) return -1; break; } else { @@ -1769,7 +1766,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) for(i=hash-1; i>=0; i--) { - if((idx->dlist[i].flags & DS_INACTIVE_DST) + if(ds_skip_dst(idx->dlist[i].flags) || (ds_use_default!=0 && i==(idx->nr-1))) continue; LM_DBG("using entry [%d/%d]\n", set, i); @@ -1803,7 +1800,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) for(i=idx->nr-1; i>hash; i--) { - if((idx->dlist[i].flags & DS_INACTIVE_DST) + if(ds_skip_dst(idx->dlist[i].flags) || (ds_use_default!=0 && i==(idx->nr-1))) continue; LM_DBG("using entry [%d/%d]\n", set, i); @@ -2026,9 +2023,9 @@ int ds_set_state(int group, str *address, int state, int type, struct sip_msg *m /* remove the Probing/Inactive-State? Set the fail-count to 0. */ if (state == DS_PROBING_DST) { if (type) { - if (idx->dlist[i].flags & DS_INACTIVE_DST) { + if (idx->dlist[i].flags & DS_DISABLED_DST) { LM_INFO("Ignoring the request to set this destination" - " to probing: It is already inactive!\n"); + " to probing: It is disabled by admin!\n"); return 0; } @@ -2050,7 +2047,7 @@ int ds_set_state(int group, str *address, int state, int type, struct sip_msg *m /* Type 2 means reply from OPTIONS-Ping */ if (type == 2) { - if (idx->dlist[i].flags & DS_INACTIVE_DST) { + if (idx->dlist[i].flags & DS_DISABLED_DST) { LM_INFO("Ignoring the request to set this destination" " to active: It is already administratively deactivated!\n"); return 0; @@ -2135,6 +2132,9 @@ int ds_reinit_state(int group, str *address, int state) && strncasecmp(idx->dlist[i].uri.s, address->s, address->len)==0) { + /* reset the bits used for states */ + idx->dlist[i].flags &= ~(DS_STATES_ALL); + /* set the new states */ idx->dlist[i].flags |= state; return 0; } @@ -2165,10 +2165,10 @@ int ds_print_list(FILE *fout) { fprintf(fout, "\n set #%d\n", list->id); - if (list->dlist[j].flags&DS_INACTIVE_DST) + if (list->dlist[j].flags&DS_DISABLED_DST) fprintf(fout, " Disabled "); - else if (list->dlist[j].flags&DS_PROBING_DST) - fprintf(fout, " Probing "); + else if (list->dlist[j].flags&DS_INACTIVE_DST) + fprintf(fout, " Inactive "); else { fprintf(fout, " Active"); /* Optional: Print the tries for this host. */ @@ -2180,6 +2180,10 @@ int ds_print_list(FILE *fout) fprintf(fout, " "); } } + if (list->dlist[j].flags&DS_PROBING_DST) + fprintf(fout, "(P)"); + else + fprintf(fout, "(*)"); fprintf(fout, " %.*s\n", list->dlist[j].uri.len, list->dlist[j].uri.s); diff --git a/modules_k/dispatcher/dispatch.h b/modules_k/dispatcher/dispatch.h index d468e01..6fcd4a5 100644 --- a/modules_k/dispatcher/dispatch.h +++ b/modules_k/dispatcher/dispatch.h @@ -52,8 +52,11 @@ #define DS_INACTIVE_DST 1 /*!< inactive destination */ #define DS_PROBING_DST 2 /*!< checking destination */ #define DS_DISABLED_DST 4 /*!< admin disabled destination */ +#define DS_STATES_ALL 7 /*!< all bits for the states of destination */ #define DS_RESET_FAIL_DST 8 /*!< Reset-Failure-Counter */ +#define ds_skip_dst(flags) ((flags) & (DS_INACTIVE_DST|DS_DISABLED_DST)) + extern str ds_db_url; extern str ds_table_name; extern str ds_set_id_col;

12 years, 6 months

git:3.2: core/sdp: restore setting of IP address type

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.2 Commit: a356ec5e2ce2daa16b1e2339880cb29a39ebc975 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a356ec5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 25 17:35:25 2011 +0200 core/sdp: restore setting of IP address type - refactoring of extract_mediaip() skipped setting IPv4/IPv6 type in sdp structure - reported by Jason Penton (cherry picked from commit 6e1af068c99e84d0bfd5f713ced1e5f484ff9c5c) --- parser/sdp/sdp_helpr_funcs.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 09a9287..13d1ca9 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -451,9 +451,16 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) LM_ERR("invalid content for `%s' line\n",line); return -1; } - if(cp[3]!='4' && cp[3]!='6') { - LM_ERR("invalid addrtype IPx for `%s' line\n",line); - return -1; + switch(cp[3]) { + case '4': + *pf = AF_INET; + break; + case '6': + *pf = AF_INET6; + break; + default: + LM_ERR("invalid addrtype IPx for `%s' line\n",line); + return -1; } cp += 5;

12 years, 6 months

git:master: dispatcher(k): clarified notes about probing mode

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9056b574f3df2d3358c3e726772d63bbbcd6dc23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9056b57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 26 18:59:39 2011 +0200 dispatcher(k): clarified notes about probing mode --- modules_k/dispatcher/README | 390 +++++++++++++------------ modules_k/dispatcher/doc/dispatcher_admin.xml | 74 +++--- 2 files changed, 237 insertions(+), 227 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=905…

12 years, 6 months

git:master: Dialog: Fixed lurking html tag in XML doc

by Jason Penton

Module: sip-router Branch: master Commit: db308939b551a920b31bdebd76c28b5b104db68c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db30893… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Oct 26 14:32:00 2011 +0200 Dialog: Fixed lurking html tag in XML doc --- modules_k/dialog/doc/dialog_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 9bcbea1..86a5ad2 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1439,7 +1439,7 @@ dlg_refer("caller", "sip:annoucement@kamailio.org"); dialog created is further processed statefully. Specifically, if a stateless response is sent out after dlg_manage() is called, the dialog cannot be handled properly. So make sure that a transaction - exists or create it explicitly using the tm module.<br>This is a + exists or create it explicitly using the tm module. This is a shortcoming of the current implementation that may be resolved in a future version hopefully. </para>

12 years, 6 months

git:jason.penton/kamailio_ims_extensions: CDP: add api load function

by Jason Penton

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 4c0dda545501e3a81b3ad7081be64820bc93fee6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c0dda5… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Tue Oct 25 12:59:05 2011 +0200 CDP: add api load function --- modules/cdp/cdp_load.h | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/modules/cdp/cdp_load.h b/modules/cdp/cdp_load.h index 7444f01..241d4c3 100644 --- a/modules/cdp/cdp_load.h +++ b/modules/cdp/cdp_load.h @@ -54,7 +54,7 @@ #ifndef _CDP_BIND_H #define _CDP_BIND_H - +#include "../../sr_module.h" #include "utils.h" #include "diameter.h" #include "diameter_api.h" @@ -116,6 +116,25 @@ struct cdp_binds { typedef int(*load_cdp_f)( struct cdp_binds *cdpb ); int load_cdp( struct cdp_binds *cdpb); +static inline int load_cdp_api(struct cdp_binds* cdpb) +{ + load_cdp_f load_cdp; + + /* import the TM auto-loading function */ + load_cdp = (load_cdp_f)find_export("load_cdp", NO_SCRIPT, 0); + + if (load_cdp == NULL) { + LOG(L_WARN, "Cannot import load_cdp function from CDP module\n"); + return -1; + } + + /* let the auto-loading function load all TM stuff */ + if (load_cdp(cdpb) == -1) { + return -1; + } + return 0; +} + #endif

12 years, 6 months

git:jason.penton/kamailio_ims_extensions: Merge branch 'jason.penton/ kamailio_ims_extensions' of ssh://git.sip-router.org/ sip-router into kamailio_ims_extensions

by Jason Penton

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 5228bfdfd1d69136449fe50d240152a6cf0b9b1d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5228bfd… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Oct 26 09:50:05 2011 +0200 Merge branch 'jason.penton/kamailio_ims_extensions' of ssh://git.sip-router.org/sip-router into kamailio_ims_extensions ---

12 years, 6 months

git:jason.penton/kamailio_ims_extensions: parser/sdp: Add fast access to raw stream information

by Jason Penton

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: dcc87ed9859637110b58cb8317ec1ad8b033d468 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dcc87ed… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Oct 26 09:31:39 2011 +0200 parser/sdp: Add fast access to raw stream information - This gives a fast access pointer to the raw stream information used in parsing the sdp_stream_cell structure. --- parser/sdp/sdp.c | 4 ++++ parser/sdp/sdp.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 6d53ab9..9dbf2de 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -474,6 +474,10 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ stream = add_sdp_stream(session, stream_num, &sdp_media, &sdp_port, &sdp_transport, &sdp_payload, is_rtp, pf, &sdp_ip); if (stream == 0) return -1; + /* Store fast access ptr to raw stream */ + stream->raw_stream.s = tmpstr1.s; + stream->raw_stream.len = tmpstr1.len; + /* increment total number of streams */ _sdp->streams_num++; diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index 353580c..1a1ea95 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -72,6 +72,7 @@ typedef struct sdp_stream_cell { str max_size; /**< RFC4975: max-size attribute */ str accept_types; /**< RFC4975: accept-types attribute */ str accept_wrapped_types; /**< RFC4975: accept-wrapped-types attribute */ + str raw_stream; /**< fast access to raw stream information */ struct sdp_payload_attr **p_payload_attr; /**< fast access pointers to payloads */ struct sdp_payload_attr *payload_attr; } sdp_stream_cell_t;

12 years, 6 months

git:jason.penton/kamailio_ims_extensions: CDP: fixed logging inconsistencies

by Jason Penton

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 67a2fa291afaf77ebc12262a868d510bbed299a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67a2fa2… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Tue Oct 25 11:03:36 2011 +0200 CDP: fixed logging inconsistencies --- modules/cdp/acceptor.c | 2 +- modules/cdp/globals.c | 30 ++++-------------------------- modules/cdp/globals.h | 10 ---------- modules/cdp/peermanager.c | 2 +- modules/cdp/receiver.c | 4 ++-- modules/cdp/tcp_accept.c | 2 +- modules/cdp/timer.c | 2 +- modules/cdp/transaction.c | 2 +- modules/cdp/worker.c | 2 +- 9 files changed, 12 insertions(+), 44 deletions(-) diff --git a/modules/cdp/acceptor.c b/modules/cdp/acceptor.c index 75dd693..1ff581c 100644 --- a/modules/cdp/acceptor.c +++ b/modules/cdp/acceptor.c @@ -113,7 +113,7 @@ void acceptor_process(dp_config *cfg) #else #ifdef PKG_MALLOC #ifdef PKG_MALLOC - LOG(memlog, "Acceptor Memory status (pkg):\n"); + LOG(L_DBG, "Acceptor Memory status (pkg):\n"); //pkg_status(); #ifdef pkg_sums pkg_sums(); diff --git a/modules/cdp/globals.c b/modules/cdp/globals.c index 0e9aa6a..32eea31 100644 --- a/modules/cdp/globals.c +++ b/modules/cdp/globals.c @@ -57,28 +57,6 @@ #include "globals.h" #include "utils.h" -#ifdef CDP_FOR_SER - -#else - -#ifdef WHARF - -#else - - unsigned long shm_mem_size = SHM_MEM_SIZE; - int memlog = L_ERR; - int memdbg = L_DBG; - int debug = L_DBG; - int log_facility = 1; - int log_stderr = 1; - int process_no=0; - -#endif - -#endif - - - //str aaa_fqdn={"unset_fqdn",10}; //str aaa_realm={"unset_realm",11}; //str aaa_identity={"unset_identity",14}; @@ -90,7 +68,7 @@ int init_memory(int show_status) if (init_pkg_mallocs()==-1) goto error; if (show_status){ - LOG(memlog, "Memory status (pkg):\n"); + LOG(L_DBG, "Memory status (pkg):\n"); pkg_status(); } #endif @@ -104,7 +82,7 @@ int init_memory(int show_status) )==-1) goto error; if (show_status){ - LOG(memlog, "Memory status (shm):\n"); + LOG(L_DBG, "Memory status (shm):\n"); shm_status(); } #endif @@ -123,7 +101,7 @@ void destroy_memory(int show_status) allow an almost gracious shutdown */ #ifdef SHM_MEM if (show_status){ - LOG(memlog, "Memory status (shm):\n"); + LOG(L_DBG, "Memory status (shm):\n"); //shm_status(); #ifndef SER_MOD_INTERFACE shm_sums(); @@ -138,7 +116,7 @@ void destroy_memory(int show_status) #endif #ifdef PKG_MALLOC if (show_status){ - LOG(memlog, "Memory status (pkg):\n"); + LOG(L_DBG, "Memory status (pkg):\n"); //pkg_status(); #ifndef SER_MOD_INTERFACE pkg_sums(); diff --git a/modules/cdp/globals.h b/modules/cdp/globals.h index 4749c5e..aa3c31d 100644 --- a/modules/cdp/globals.h +++ b/modules/cdp/globals.h @@ -62,16 +62,6 @@ #define DPNAME "CDiameterPeer" #define DPVERSION "0.0.2" - -#define L_MEM L_DBG - - -#ifdef CDP_FOR_SER -#else -extern unsigned long shm_mem_size; -extern int memlog; -#endif - extern int process_no; int init_memory(int show_status); diff --git a/modules/cdp/peermanager.c b/modules/cdp/peermanager.c index 09f6edc..8d2f43e 100644 --- a/modules/cdp/peermanager.c +++ b/modules/cdp/peermanager.c @@ -272,7 +272,7 @@ int peer_timer(time_t now,void *ptr) { peer *p,*n; int i; - LOG(L_MEM,"DBG:peer_timer(): taking care of peers...\n"); + LOG(L_DBG,"DBG:peer_timer(): taking care of peers...\n"); lock_get(peer_list_lock); p = peer_list->head; while(p){ diff --git a/modules/cdp/receiver.c b/modules/cdp/receiver.c index b45f3d7..585b80a 100644 --- a/modules/cdp/receiver.c +++ b/modules/cdp/receiver.c @@ -495,7 +495,7 @@ done: #else #ifdef PKG_MALLOC #ifdef PKG_MALLOC - LOG(memlog, "Receiver[%.*s] Memory status (pkg):\n", + LOG(L_DBG, "Receiver[%.*s] Memory status (pkg):\n", p?p->fqdn.len:0,p?p->fqdn.s:0); //pkg_status(); #ifdef pkg_sums @@ -663,7 +663,7 @@ int receive_loop(peer *original_peer) while(!n){ if (shutdownx&&*shutdownx) break; - log_serviced_peers(L_MEM); + log_serviced_peers(L_DBG); max =-1; diff --git a/modules/cdp/tcp_accept.c b/modules/cdp/tcp_accept.c index 9a7e964..84e8798 100644 --- a/modules/cdp/tcp_accept.c +++ b/modules/cdp/tcp_accept.c @@ -225,7 +225,7 @@ void accept_loop() nready = select( max_sock+1, &listen_set, 0, 0, &timeout); if (nready == 0){ - LOG(L_MEM,"DBG:accept_loop(): No connection attempts\n"); + LOG(L_DBG,"DBG:accept_loop(): No connection attempts\n"); continue; } if (nready == -1) { diff --git a/modules/cdp/timer.c b/modules/cdp/timer.c index 9e75f9d..75b43ee 100644 --- a/modules/cdp/timer.c +++ b/modules/cdp/timer.c @@ -219,7 +219,7 @@ void timer_process(int returns) #else #ifdef PKG_MALLOC #ifdef PKG_MALLOC - LOG(memlog, "Timer Memory status (pkg):\n"); + LOG(L_DBG, "Timer Memory status (pkg):\n"); //pkg_status(); #ifdef pkg_sums pkg_sums(); diff --git a/modules/cdp/transaction.c b/modules/cdp/transaction.c index 27f9803..3b39496 100644 --- a/modules/cdp/transaction.c +++ b/modules/cdp/transaction.c @@ -199,7 +199,7 @@ inline void cdp_free_trans(cdp_trans_t *x) int cdp_trans_timer(time_t now, void* ptr) { cdp_trans_t *x,*n; - LOG(L_MEM,"DBG:trans_timer(): taking care of diameter transactions...\n"); + LOG(L_DBG,"DBG:trans_timer(): taking care of diameter transactions...\n"); lock_get(trans_list->lock); x = trans_list->head; while(x) diff --git a/modules/cdp/worker.c b/modules/cdp/worker.c index 026d279..fbb55ec 100644 --- a/modules/cdp/worker.c +++ b/modules/cdp/worker.c @@ -409,7 +409,7 @@ void worker_process(int id) #ifdef CDP_FOR_SER #else #ifdef PKG_MALLOC - LOG(memlog, "Worker[%d] Memory status (pkg):\n",id); + LOG(L_DBG, "Worker[%d] Memory status (pkg):\n",id); //pkg_status(); #ifdef pkg_sums pkg_sums();

12 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011