sr-dev December 2014

sr-dev@lists.kamailio.org

33 participants
255 discussions

[tracker] Task opened: add support to auth_db to validate source IP address (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Emmanuel Schmidbauer (eschmidbauer) Attached to Project - sip-router Summary - add support to auth_db to validate source IP address Task Type - Improvement Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 4.2 Due in Version - Undecided Due Date - Undecided Details - I've attached the git diff. This improvement is only executed if the module parameter "ip_address_column" is defined Example: modparam("auth_db", "ip_address_column", "ip_address") This way it will not affect those who do not wish to implement this feature and still upgrade. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=499 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 5 months

git:master: modules/ims_registrar_scscf: improved log line

by Richard Good

Module: sip-router Branch: master Commit: c512ed9f19b903cb028769bc6c802280d2b0ddfd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c512ed9… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Dec 3 15:43:51 2014 +0200 modules/ims_registrar_scscf: improved log line --- modules/ims_registrar_scscf/registrar_notify.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index dacde16..5f131d9 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -1125,11 +1125,12 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { goto error; } } else { - LM_ERR("Re-subscribe for same watcher_contact, presentity_uri, event but with different callid [%.*s], fromtag [%.*s] and totag [%.*s] for presentity [%.*s] - What happened?\n", + LM_ERR("Re-subscribe for same watcher_contact, presentity_uri, event but with different callid [%.*s], fromtag [%.*s] and totag [%.*s] for presentity [%.*s] and watcher contact [%.*s] - What happened?\n", subscriber_data.callid->len, subscriber_data.callid->s, subscriber_data.ftag->len, subscriber_data.ftag->s, subscriber_data.ttag->len, subscriber_data.ttag->s, - presentity_impurecord->public_identity.len, presentity_impurecord->public_identity.s); + presentity_impurecord->public_identity.len, presentity_impurecord->public_identity.s, + subscriber_data.watcher_contact->len, subscriber_data.watcher_contact->s); LM_DBG("Removing old subscriber and adding new one\n"); subscriber_data.presentity_uri = &presentity_impurecord->public_identity; ul.external_delete_subscriber(reg_subscriber, (udomain_t*) _t, 0 /*domain is already locked*/);

9 years, 5 months

Dialplan docs

by Olle E. Johansson

dpid: 1 pr: 1 match_op: 1 match_exp: ^0([1-9][0-9]+)$ match_len: 0 subst_exp: ^0([1-9][0-9]+)$ repl_exp: 0049\1 attrs: de . This is the example we have in the dialplan documentation. I wonder why we have "(" and ")" in the match_exp. It makes sense in the subst_exp - but I still wonder about the match_exp. If there's no use of it I would like to simplify the example. /O

9 years, 5 months

[tracker] Comment added: Kamailio Crash in WEBSOCKET module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#495 - Kamailio Crash in WEBSOCKET module User who did this - Vitaliy Aleksandrov (Vitaliy) ---------- There was a race condition that is fixed in 4.1.3. So it is likely that upgrade will solve your problem. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=495#comment1716 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 5 months

git:master: modules/pua: do not override send_publish return value at error

by Juha Heinanen

Module: sip-router Branch: master Commit: 28ff58cfffc4d2b7bc0d2d3d2365891ecb25fcb6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28ff58c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 3 09:13:49 2014 +0200 modules/pua: do not override send_publish return value at error (cherry picked from commit 0ac4c8e579214a75b102f2f1c6877dffb2db8597) --- modules/pua/send_publish.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/pua/send_publish.c b/modules/pua/send_publish.c index 3ddd5e7..c04163e 100644 --- a/modules/pua/send_publish.c +++ b/modules/pua/send_publish.c @@ -718,7 +718,6 @@ done: goto finish; error: - ret = -1; if(cb_param) shm_free(cb_param);

9 years, 5 months

git:4.2: modules/pua: do not override send_publish return value at error

by Juha Heinanen

Module: sip-router Branch: 4.2 Commit: 0ac4c8e579214a75b102f2f1c6877dffb2db8597 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ac4c8e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 3 09:13:49 2014 +0200 modules/pua: do not override send_publish return value at error --- modules/pua/send_publish.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/pua/send_publish.c b/modules/pua/send_publish.c index da74ab7..b0d540c 100644 --- a/modules/pua/send_publish.c +++ b/modules/pua/send_publish.c @@ -716,7 +716,6 @@ done: goto finish; error: - ret = -1; if(cb_param) shm_free(cb_param);

9 years, 5 months

[tracker] Task closed: kamctl warning when greadlink does not exist

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#492 - kamctl warning when greadlink does not exist User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patches in master and 4.2 More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=492 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 5 months

[tracker] Task closed: Kamailio Crash in WEBSOCKET module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#495 - Kamailio Crash in WEBSOCKET module User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=495 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 5 months

pua/send_publish bug

by Juha Heinanen

while working on pua_rpc module, i think i found a bug in pua/send_publish function. it defines int ret = -1; if etag check fails or publish has no body, it does this: ret = 418; goto error; or ret = ERR_PUBLISH_NO_BODY; goto error; at error, however, the above assignments are reverted: error: ret = -1; my suggestion is to remove the above assignment. ok? -- juha

9 years, 5 months

some pua_rpc progress

by Juha Heinanen

i have made progress with pua_rpc module. the remaining problem is that rpc->fault does not produce proper fault document when its argument is delayed_ctx. in the publish() function below, rpc->fault calls work fine up to the point when delayed ctx is created: dctx = rpc->delayed_ctx_new(c); after that for example this piece of code if (ret == 418) { /* rpc->add(c, "ds", 500, "Wrong ETag"); */ rpc->fault(c, 500, "Wrong ETag"); rpc->delayed_ctx_close(dctx); } produces HTTP/1.1 200 OK. Via: SIP/2.0/TCP 127.0.0.1:52280. Server: OpenXg SIP Proxy (4.3.0-0 (i386/linux)). Content-Length: 108. . <?xml version="1.0"?> <methodResponse> <params> <param> <value></value> </param> </params> that is, failure response document is empty. if i make the rpc->add call instead, i get HTTP/1.1 200 OK. Via: SIP/2.0/TCP 127.0.0.1:52204. Server: OpenXg SIP Proxy (4.3.0-0 (i386/linux)). Content-Length: 151. . <?xml version="1.0"?> <methodResponse> <params> <param> <value><int>500</int> <string>Wrong ETag</string> </value> </param> </params> </methodResponse> any ideas how to make rpc->fault to work on delayed ctx? -- juha #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #include "../../sr_module.h" #include "../../parser/parse_expires.h" #include "../../dprint.h" #include "../../mem/shm_mem.h" #include "../../parser/msg_parser.h" #include "../../str.h" #include "../../mem/mem.h" #include "../../pt.h" #include "../../rpc_lookup.h" #include "../../modules/tm/tm_load.h" #include "../../lib/kcore/cmpapi.h" #include "../pua/pua_bind.h" MODULE_VERSION static int mod_init(void); send_publish_t pua_send_publish; static const char* publish_doc[2] = { "sends publish request and waits for the final reply, using a list " "of string parameters: presentity uri, expires, event package, " "content type, id, etag, outbound proxy, extra headers, " " and body (optional)", 0 }; static int publish_callback(ua_pres_t* hentity, struct sip_msg* reply) { rpc_delayed_ctx_t* dctx; void* c; rpc_t* rpc; struct hdr_field* hdr= NULL; int statuscode; int expires; int found; str etag; str reason = {0, 0}; LM_DBG("running callback\n"); if (reply == NULL || hentity == NULL || hentity->cb_param == NULL) { LM_ERR("NULL reply or hentity parameter\n"); return -1; } dctx = (rpc_delayed_ctx_t *)(hentity->cb_param); hentity->cb_param = NULL; if (dctx == 0){ BUG("null delayed reply ctx\n"); return -1; } rpc = &dctx->rpc; c = dctx->reply_ctx; if (reply == FAKED_REPLY) { statuscode = 408; reason.s = "Request Timeout"; reason.len = strlen(reason.s); } else { statuscode = reply->first_line.u.reply.statuscode; reason = reply->first_line.u.reply.reason; } rpc->add(c, "dS", statuscode, &reason); if (statuscode == 200) { expires = ((exp_body_t*)reply->expires->parsed)->val; LM_DBG("expires = %d\n", expires); hdr = reply->headers; found = 0; while (hdr != NULL) { if(cmp_hdrname_strzn(&hdr->name, "SIP-ETag",8) == 0) { found = 1; break; } hdr = hdr->next; } if (found == 0) { LM_ERR("SIP-ETag header field not found\n"); rpc->delayed_ctx_close(dctx); return -1; } etag = hdr->body; LM_DBG("SIP-Etag = %.*s\n", etag.len, etag.s); rpc->add(c, "Sd", &etag, expires); } rpc->delayed_ctx_close(dctx); return 0; } static void publish(rpc_t* rpc, void* c) { str pres_uri, expires, event, content_type, id, etag, outbound_proxy, extra_headers, body; rpc_delayed_ctx_t* dctx; int exp, sign, ret, err_ret, sip_error; char err_buf[MAX_REASON_LEN]; struct sip_uri uri; publ_info_t publ; body.s = 0; body.len = 0; dctx = 0; LM_DBG("rpc publishing ...\n"); if ((rpc->capabilities == 0) || !(rpc->capabilities(c) & RPC_DELAYED_REPLY)) { rpc->fault(c, 600, "Reply wait/async mode not supported" " by this rpc transport"); return; } ret = rpc->scan(c, "SSSSSSSS*S", &pres_uri, &expires, &event, &content_type, &id, &etag, &outbound_proxy, &extra_headers, &body); if (ret < 8) { rpc->fault(c, 400, "too few parameters (%d)", ret); return; } if (parse_uri(pres_uri.s, pres_uri.len, &uri) <0) { LM_ERR("bad resentity uri\n"); rpc->fault(c, 400, "Invalid presentity uri '%s'", pres_uri.s); return; } LM_DBG("presentity uri '%.*s'\n", pres_uri.len, pres_uri.s); if (expires.s[0]== '-') { sign= -1; expires.s++; expires.len--; } else { sign = 1; } if (str2int(&expires, (unsigned int*)&exp) < 0) { LM_ERR("invalid expires parameter\n" ); rpc->fault(c, 400, "Invalid expires '%s'", expires.s); return; } exp = exp * sign; LM_DBG("expires '%d'\n", exp); LM_DBG("event '%.*s'\n", event.len, event.s); LM_DBG("content type '%.*s'\n", content_type.len, content_type.s); LM_DBG("id '%.*s'\n", id.len, id.s); LM_DBG("ETag '%.*s'\n", etag.len, etag.s); LM_DBG("outbound_proxy '%.*s'\n", outbound_proxy.len, outbound_proxy.s); LM_DBG("extra headers '%.*s'\n", extra_headers.len, extra_headers.s); if (body.len > 0) LM_DBG("body '%.*s'\n", body.len, body.s); if ((body.s == 0) && (content_type.len != 1 || content_type.s[0] != '.')) { LM_ERR("body is missing, but content type is not .\n"); rpc->fault(c, 400, "Body is missing"); return; } memset(&publ, 0, sizeof(publ_info_t)); publ.pres_uri= &pres_uri; publ.expires= exp; publ.event= get_event_flag(&event); if (publ.event < 0) { LM_ERR("unknown event '%.*s'\n", event.len, event.s); rpc->fault(c, 400, "Unknown event"); return; } if (content_type.len != 1) { publ.content_type= content_type; } if (!((id.len == 1) && (id.s[0]== '.'))) { publ.id= id; } if (!((etag.len== 1) && (etag.s[0]== '.'))) { publ.etag= &etag; } if (!((outbound_proxy.len == 1) && (outbound_proxy.s[0] == '.'))) { publ.outbound_proxy = &outbound_proxy; } if (!((extra_headers.len == 1) && (extra_headers.s[0] == '.'))) { publ.extra_headers = &extra_headers; } if (body.s != 0) { publ.body= &body; } dctx = rpc->delayed_ctx_new(c); if (dctx == 0) { LM_ERR("internal error: failed to create context\n"); rpc->fault(c, 500, "internal error: failed to create context"); return; } publ.cb_param = dctx; publ.source_flag = MI_ASYN_PUBLISH; ret = pua_send_publish(&publ); LM_DBG("pua_send_publish returned %d\n", ret); if (dctx->reply_ctx != 0) { /* callback was not executed or its execution failed */ rpc = &dctx->rpc; c = dctx->reply_ctx; } else { return; } if (ret < 0) { LM_ERR("pua_send_publish failed\n"); err_ret = err2reason_phrase(ret, &sip_error, err_buf, sizeof(err_buf), "RPC/PUBLISH") ; if (err_ret > 0 ) { rpc->fault(c, sip_error, "%s", err_buf); } else { rpc->fault(c, 500, "RPC/PUBLISH error"); } rpc->delayed_ctx_close(dctx); } if (ret == 418) { /* rpc->add(c, "ds", 500, "Wrong ETag"); */ rpc->fault(c, 500, "Wrong ETag"); rpc->delayed_ctx_close(dctx); } return; } rpc_export_t pua_rpc[] = { {"pua.publish", publish, publish_doc, 0}, {0, 0, 0, 0} }; /** module exports */ struct module_exports exports= { "pua_rpc", 0, pua_rpc, 0, mod_init, 0, 0, 0, 0 }; /** * init module function */ static int mod_init(void) { bind_pua_t bind_pua; pua_api_t pua; LM_DBG("initializing\n"); bind_pua= (bind_pua_t)find_export("bind_pua", 1,0); if (!bind_pua) { LM_ERR("can't find pua\n"); return -1; } if (bind_pua(&pua) < 0) { LM_ERR("can't bind pua\n"); return -1; } if (pua.send_publish == NULL) { LM_ERR("could not import send_publish\n"); return -1; } pua_send_publish = pua.send_publish; if (pua.register_puacb(MI_ASYN_PUBLISH, publish_callback, NULL) < 0) { LM_ERR("could not register callback\n"); return -1; } return 0; }

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2014