sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:mariusbucur/dmq: added support for binding the dmq module within another module.

by Marius Ovidiu Bucur

Module: sip-router Branch: mariusbucur/dmq Commit: ba31d863c9475bafc7d6073e3a6ebdd0b40e207a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba31d86… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Wed Apr 6 19:30:31 2011 +0300 added support for binding the dmq module within another module. also, finished the implementation for the dmq worker queues --- modules_k/dmq/bind_dmq.c | 7 +++ modules_k/dmq/message.c | 29 +++++++++++ modules_k/dmq/message.h | 2 + modules_k/dmq/peer.c | 43 ++++++++++++++++ modules_k/dmq/peer.h | 35 +++++++++++++ modules_k/dmq/worker.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++ modules_k/dmq/worker.h | 43 ++++++++++++++++ 7 files changed, 279 insertions(+), 0 deletions(-) diff --git a/modules_k/dmq/bind_dmq.c b/modules_k/dmq/bind_dmq.c new file mode 100644 index 0000000..6744753 --- /dev/null +++ b/modules_k/dmq/bind_dmq.c @@ -0,0 +1,7 @@ +#include "bind_dmq.h" +#include "peer.h" + +int bind_dmq(dmq_api_t* api) { + api->register_dmq_peer = register_dmq_peer; + return 0; +} \ No newline at end of file diff --git a/modules_k/dmq/message.c b/modules_k/dmq/message.c new file mode 100644 index 0000000..55f385c --- /dev/null +++ b/modules_k/dmq/message.c @@ -0,0 +1,29 @@ +#include "../../parser/parse_to.h" +#include "../../parser/parse_uri.h" +#include "../../parser/parse_content.h" +#include "../../parser/parse_from.h" +#include "../../ut.h" +#include "worker.h" +#include "peer.h" +#include "message.h" + +int handle_dmq_message(struct sip_msg* msg, char* str1, char* str2) { + dmq_peer_t* peer; + if ((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s)) { + LM_ERR("cannot parse msg URI\n"); + return -1; + } + LM_DBG("handle_dmq_message [%.*s %.*s] [%s %s]\n", + msg->first_line.u.request.method.len, msg->first_line.u.request.method.s, + msg->first_line.u.request.uri.len, msg->first_line.u.request.uri.s, + ZSW(str1), ZSW(str2)); + /* the peer id is given as the userinfo part of the request URI */ + peer = find_peer(msg->parsed_uri.user); + if(!peer) { + LM_DBG("no peer found for %.*s\n", msg->parsed_uri.user.len, msg->parsed_uri.user.s); + return 0; + } + LM_DBG("handle_dmq_message peer found: %.*s\n", msg->parsed_uri.user.len, msg->parsed_uri.user.s); + add_dmq_job(msg, peer); + return 0; +} \ No newline at end of file diff --git a/modules_k/dmq/message.h b/modules_k/dmq/message.h new file mode 100644 index 0000000..7e0cb95 --- /dev/null +++ b/modules_k/dmq/message.h @@ -0,0 +1,2 @@ + +int handle_dmq_message(struct sip_msg*, char*, char*); \ No newline at end of file diff --git a/modules_k/dmq/peer.c b/modules_k/dmq/peer.c new file mode 100644 index 0000000..1ec177f --- /dev/null +++ b/modules_k/dmq/peer.c @@ -0,0 +1,43 @@ +#include "peer.h" + +dmq_peer_list_t* init_peer_list() { + dmq_peer_list_t* peer_list = shm_malloc(sizeof(dmq_peer_list_t)); + memset(peer_list, 0, sizeof(dmq_peer_list_t)); + return peer_list; +} + +dmq_peer_t* search_peer_list(dmq_peer_list_t* peer_list, dmq_peer_t* peer) { + dmq_peer_t* cur = peer_list->peers; + int len; + while(cur) { + /* len - the minimum length of the two strings */ + len = cur->peer_id.len < peer->peer_id.len ? cur->peer_id.len:peer->peer_id.len; + if(strncasecmp(cur->peer_id.s, peer->peer_id.s, len) == 0) { + return cur; + } + } + return 0; +} + +void add_peer(dmq_peer_list_t* peer_list, dmq_peer_t* peer) { + dmq_peer_t* new_peer = shm_malloc(sizeof(dmq_peer_t)); + *new_peer = *peer; + new_peer->next = peer_list->peers; + peer_list->peers = new_peer; +} + +int register_dmq_peer(dmq_peer_t* peer) { + if(search_peer_list(peer_list, peer)) { + LM_ERR("peer already exists: %.*s %.*s\n", peer->peer_id.len, peer->peer_id.s, + peer->description.len, peer->description.s); + return -1; + } + add_peer(peer_list, peer); + return 0; +} + +dmq_peer_t* find_peer(str peer_id) { + dmq_peer_t foo_peer; + foo_peer.peer_id = peer_id; + return search_peer_list(peer_list, &foo_peer); +} \ No newline at end of file diff --git a/modules_k/dmq/peer.h b/modules_k/dmq/peer.h new file mode 100644 index 0000000..72c851f --- /dev/null +++ b/modules_k/dmq/peer.h @@ -0,0 +1,35 @@ +#ifndef PEER_H +#define PEER_H + +#include <string.h> +#include <stdlib.h> +#include "../../str.h" +#include "../../mem/mem.h" +#include "../../mem/shm_mem.h" +#include "../../parser/msg_parser.h" + +typedef int(*peer_callback_t)(struct sip_msg*); + +typedef struct dmq_peer { + str peer_id; + str description; + peer_callback_t callback; + struct dmq_peer* next; +} dmq_peer_t; + +typedef struct dmq_peer_list { + dmq_peer_t* peers; + int count; +} dmq_peer_list_t; + +extern dmq_peer_list_t* peer_list; + +dmq_peer_list_t* init_peer_list(); +dmq_peer_t* search_peer_list(dmq_peer_list_t* peer_list, dmq_peer_t* peer); +typedef int (*register_dmq_peer_t)(dmq_peer_t*); + +int register_dmq_peer(dmq_peer_t* peer); +dmq_peer_t* find_peer(str peer_id); + + +#endif \ No newline at end of file diff --git a/modules_k/dmq/worker.c b/modules_k/dmq/worker.c new file mode 100644 index 0000000..6eaae21 --- /dev/null +++ b/modules_k/dmq/worker.c @@ -0,0 +1,120 @@ +#include "dmq.h" +#include "worker.h" + +void worker_loop(int id) { + dmq_worker_t* worker = &workers[id]; + dmq_job_t* current_job; + int ret_value; + for(;;) { + LM_DBG("dmq_worker [%d %d] getting lock\n", id, my_pid()); + lock_get(&worker->lock); + LM_DBG("dmq_worker [%d %d] lock acquired\n", id, my_pid()); + /* multiple lock_release calls might be performed, so remove from queue until empty */ + do { + current_job = job_queue_pop(worker->queue); + /* job_queue_pop might return NULL if queue is empty */ + if(current_job) { + ret_value = current_job->f(current_job->msg); + if(ret_value < 0) { + LM_ERR("running job failed\n"); + } + shm_free(current_job); + worker->jobs_processed++; + } + } while(job_queue_size(worker->queue) > 0); + } +} + +int add_dmq_job(struct sip_msg* msg, dmq_peer_t* peer) { + int i, found_available = 0; + dmq_job_t new_job; + dmq_worker_t* worker; + new_job.f = peer->callback; + new_job.msg = msg; + new_job.orig_peer = peer; + if(!num_workers) { + LM_ERR("error in add_dmq_job no workers spawned\n"); + return -1; + } + /* initialize the worker with the first one */ + worker = workers; + /* search for an available worker, or, if not possible, for the least busy one */ + for(i = 0; i < num_workers; i++) { + if(job_queue_size(workers[i].queue) == 0) { + worker = &workers[i]; + found_available = 1; + break; + } else if(job_queue_size(workers[i].queue) < job_queue_size(worker->queue)) { + worker = &workers[i]; + } + } + if(!found_available) { + LM_DBG("no available worker found, passing job to the least busy one\n"); + } + job_queue_push(worker->queue, &new_job); + lock_release(&worker->lock); + return 0; +} + +void init_worker(dmq_worker_t* worker) { + memset(worker, 0, sizeof(*worker)); + lock_init(&worker->lock); + // acquire the lock for the first time - so that dmq_worker_loop blocks + lock_get(&worker->lock); + worker->queue = alloc_job_queue(); +} + +job_queue_t* alloc_job_queue() { + job_queue_t* queue = shm_malloc(sizeof(job_queue_t)); + atomic_set(&queue->count, 0); + queue->front = NULL; + queue->back = NULL; + lock_init(&queue->lock); + return queue; +} + +void destroy_job_queue(job_queue_t* queue) { + shm_free(queue); +} + +int job_queue_size(job_queue_t* queue) { + return atomic_get(&queue->count); +} + +void job_queue_push(job_queue_t* queue, dmq_job_t* job) { + /* we need to copy the dmq_job into a newly created dmq_job in shm */ + dmq_job_t* newjob = shm_malloc(sizeof(dmq_job_t)); + *newjob = *job; + + lock_get(&queue->lock); + newjob->prev = NULL; + newjob->next = queue->back; + if(queue->back) { + queue->back->prev = newjob; + } + queue->back = newjob; + if(!queue->front) { + queue->front = newjob; + } + atomic_inc(&queue->count); + lock_release(&queue->lock); +} +dmq_job_t* job_queue_pop(job_queue_t* queue) { + dmq_job_t* front; + lock_get(&queue->lock); + if(!queue->front) { + lock_release(&queue->lock); + return NULL; + } + front = queue->front; + if(front->prev) { + queue->front = front->prev; + front->prev->next = NULL; + } else { + queue->front = NULL; + queue->back = NULL; + } + atomic_dec(&queue->count); + lock_release(&queue->lock); + return front; +} \ No newline at end of file diff --git a/modules_k/dmq/worker.h b/modules_k/dmq/worker.h new file mode 100644 index 0000000..61eda09 --- /dev/null +++ b/modules_k/dmq/worker.h @@ -0,0 +1,43 @@ +#ifndef DMQ_WORKER_H +#define DMQ_WORKER_H + +#include "peer.h" +#include "../../locking.h" +#include "../../atomic_ops.h" +#include "../../parser/msg_parser.h" + +typedef struct dmq_job { + peer_callback_t f; + struct sip_msg* msg; + dmq_peer_t* orig_peer; + struct dmq_job* next; + struct dmq_job* prev; +} dmq_job_t; + +typedef struct job_queue { + atomic_t count; + struct dmq_job* back; + struct dmq_job* front; + gen_lock_t lock; +} job_queue_t; + +struct dmq_worker { + job_queue_t* queue; + int jobs_processed; + gen_lock_t lock; + int pid; +}; + +typedef struct dmq_worker dmq_worker_t; + +void init_worker(dmq_worker_t* worker); +int add_dmq_job(struct sip_msg*, dmq_peer_t*); +void worker_loop(int id); + +job_queue_t* alloc_job_queue(); +void destroy_job_queue(job_queue_t* queue); +void job_queue_push(job_queue_t* queue, dmq_job_t* job); +dmq_job_t* job_queue_pop(job_queue_t* queue); +int job_queue_size(job_queue_t* queue); + +#endif \ No newline at end of file

13 years, 7 months

git:carstenbock/ims: - should use "callid"-attribute instead of "id" -attribute in XML.

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: e00b3e3d43ba2e822aa5ed358b19a3b290d3ed39 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e00b3e3… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Apr 6 11:16:55 2011 +0200 - should use "callid"-attribute instead of "id"-attribute in XML. --- modules_k/pua_reginfo/notify.c | 2 +- modules_k/pua_reginfo/usrloc_cb.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules_k/pua_reginfo/notify.c b/modules_k/pua_reginfo/notify.c index 7d076e5..e753053 100644 --- a/modules_k/pua_reginfo/notify.c +++ b/modules_k/pua_reginfo/notify.c @@ -173,7 +173,7 @@ int process_body(str notify_body, udomain_t * domain) { while (contacts) { if (xmlStrcasecmp(contacts->name, BAD_CAST "contact") != 0) goto next_contact; - callid.s = xmlGetAttrContentByName(contacts, "id"); + callid.s = xmlGetAttrContentByName(contacts, "callid"); if (callid.s == NULL) { LM_ERR("No Call-ID for this contact!\n"); goto next_contact; diff --git a/modules_k/pua_reginfo/usrloc_cb.c b/modules_k/pua_reginfo/usrloc_cb.c index 2fa47f6..6fb807c 100644 --- a/modules_k/pua_reginfo/usrloc_cb.c +++ b/modules_k/pua_reginfo/usrloc_cb.c @@ -114,7 +114,7 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { goto error; } memset(buf, 0, sizeof(buf)); - buf_len = snprintf(buf, sizeof(buf), "%.*s", ptr->callid.len, ptr->callid.s); + buf_len = snprintf(buf, sizeof(buf), "%p", ptr); xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST ptr->callid.s); /* Check, if this is the modified contact: */ if (ptr == c) { @@ -140,7 +140,12 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { buf_len = snprintf(buf, sizeof(buf), "%.3f", q); xmlNewProp(contact_node, BAD_CAST "q", BAD_CAST buf); } - + /* CallID Attribute */ + buf_len = snprintf(buf, sizeof(buf), "%.*s", ptr->callid.len, ptr->callid.s); + xmlNewProp(contact_node, BAD_CAST "callid", BAD_CAST ptr->callid.s); + /* CSeq Attribute */ + buf_len = snprintf(buf, sizeof(buf), "%d", ptr->cseq); + uri_node = xmlNewChild(contact_node, NULL, BAD_CAST "cseq", BAD_CAST buf) ; /* URI-Node */ buf_len = snprintf(buf, sizeof(buf), "%.*s", ptr->c.len, ptr->c.s); uri_node = xmlNewChild(contact_node, NULL, BAD_CAST "uri", BAD_CAST buf) ;

13 years, 7 months

git:carstenbock/ims: - Start of implementation of storage into usrloc

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: fa7dbc24cd134f64ca42a8e3da8afcb346fa7102 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa7dbc2… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Apr 6 18:09:43 2011 +0200 - Start of implementation of storage into usrloc --- modules_k/pua_reginfo/notify.c | 205 +++++++++++++++++++++++++++++----------- 1 files changed, 148 insertions(+), 57 deletions(-) diff --git a/modules_k/pua_reginfo/notify.c b/modules_k/pua_reginfo/notify.c index e753053..eeb9450 100644 --- a/modules_k/pua_reginfo/notify.c +++ b/modules_k/pua_reginfo/notify.c @@ -24,8 +24,10 @@ #include "notify.h" #include "../../parser/parse_from.h" #include "../../parser/parse_content.h" +#include "../../parser/parse_uri.h" #include "../../modules_k/usrloc/usrloc.h" #include <libxml/parser.h> +#include "pua_reginfo.h" /*<?xml version="1.0"?> <reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="0" state="full"> @@ -56,6 +58,33 @@ #define EVENT_REFRESHED 4 #define EVENT_EXPIRED 5 +#define RESULT_ERROR -1 +#define RESULT_CONTACTS_FOUND 1 +#define RESULT_NO_CONTACTS 2 + +int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str callid, int cseq, int expires, int event, str contact_uri) { + if (*ul_record == NULL) { + switch(event) { + case EVENT_REGISTERED: + case EVENT_CREATED: + case EVENT_REFRESHED: + /* In case, no record exists and new one should be created, + create a new entry for this user in the usrloc-DB */ + if (ul.insert_urecord(domain, &aor, ul_record) < 0) { + LM_ERR("failed to insert new user-record\n"); + return RESULT_NO_CONTACTS; + } + break; + default: + /* No entry in usrloc and the contact is expired, deleted, unregistered, whatever: + We do not need to do anything. */ + return RESULT_NO_CONTACTS; + break; + } + } + return RESULT_NO_CONTACTS; +} + xmlNodePtr xmlGetNodeByName(xmlNodePtr parent, const char *name) { xmlNodePtr cur = parent; xmlNodePtr match = NULL; @@ -127,18 +156,20 @@ int reginfo_parse_event(char * s) { } int process_body(str notify_body, udomain_t * domain) { - xmlNodePtr doc_root = NULL; xmlDocPtr doc= NULL; - xmlNodePtr registrations = NULL; - xmlNodePtr contacts = NULL; - xmlNodePtr uris = NULL; + xmlNodePtr doc_root = NULL, registrations = NULL, contacts = NULL, uris = NULL; str aor = {0, 0}; str callid = {0, 0}; str contact_uri = {0, 0}; - int state; - int event; - char * expires_char; - int expires; + int state, event, expires, result, final_result = RESULT_ERROR; + char * expires_char, * cseq_char; + int cseq; + urecord_t * ul_record; + ucontact_t * ul_contact; + struct sip_uri parsed_aor; + + /* Temporary */ + int mem_only = 1; doc = xmlParseMemory(notify_body.s, notify_body.len); if(doc== NULL) { @@ -167,70 +198,128 @@ int process_body(str notify_body, udomain_t * domain) { goto next_registration; } aor.len = strlen(aor.s); - LM_ERR("AOR %.*s has state \"%d\"\n", aor.len, aor.s, state); - /* Now lets process the Contact's from this Registration: */ - contacts = registrations->children; - while (contacts) { - if (xmlStrcasecmp(contacts->name, BAD_CAST "contact") != 0) - goto next_contact; - callid.s = xmlGetAttrContentByName(contacts, "callid"); - if (callid.s == NULL) { - LM_ERR("No Call-ID for this contact!\n"); - goto next_contact; - } - callid.len = strlen(callid.s); + LM_DBG("AOR %.*s has state \"%d\"\n", aor.len, aor.s, state); - event = reginfo_parse_event(xmlGetAttrContentByName(contacts, "event")); - if (event == EVENT_UNKNOWN) { - LM_ERR("No event for this contact!\n"); - goto next_contact; - } - expires_char = xmlGetAttrContentByName(contacts, "expires"); - if (expires_char == NULL) { - LM_ERR("No expires for this contact!\n"); - goto next_contact; - } - expires = atoi(expires_char); - if (expires < 0) { - LM_ERR("No valid expires for this contact!\n"); - goto next_contact; + /* Get username part of the AOR, search for @ in the AOR. */ + if (parse_uri(aor.s, aor.len, &parsed_aor) < 0) { + LM_ERR("failed to parse Address of Record (%.*s)\n", + aor.len, aor.s); + goto next_registration; + } + + /* Now let's lock that domain for this AOR: */ + ul.lock_udomain(domain, &parsed_aor.user); + /* and retrieve the user-record for this user: */ + result = ul.get_urecord(domain, &parsed_aor.user, &ul_record); + if (result < 0) { + ul.unlock_udomain(domain, &parsed_aor.user); + LM_ERR("failed to query usrloc (User %.*s)\n", + parsed_aor.user.len, parsed_aor.user.s); + goto next_registration; + } + /* If no contacts found, then set the ul_record to NULL */ + if (result != 0) ul_record = NULL; + + /* If the state is terminated, we just can delete all bindings */ + if (state == STATE_TERMINATED) { + if (ul_record) { + ul_contact = ul_record->contacts; + while(ul_contact) { + if (mem_only) { + ul_contact->flags |= FL_MEM; + } else { + ul_contact->flags &= ~FL_MEM; + } + ul_contact = ul_contact->next; + } + if (ul.delete_urecord(domain, &parsed_aor.user, ul_record) < 0) { + LM_ERR("failed to remove record from usrloc\n"); + } + /* If already a registration with contacts was found, then keep that result. + otherwise the result is now "No contacts found" */ + if (final_result != RESULT_CONTACTS_FOUND) final_result = RESULT_NO_CONTACTS; } - LM_ERR("%.*s: Event \"%d\", expires %d\n", - callid.len, callid.s, event, expires); - /* Now lets process the URI's from this Contact: */ - uris = contacts->children; - while (uris) { - if (xmlStrcasecmp(uris->name, BAD_CAST "uri") != 0) - goto next_uri; - contact_uri.s = (char*)xmlNodeGetContent(uris); - if (contact_uri.s == NULL) { - LM_ERR("No URI for this contact!\n"); - goto next_registration; + /* Otherwise, process the content */ + } else { + /* Now lets process the Contact's from this Registration: */ + contacts = registrations->children; + while (contacts) { + if (xmlStrcasecmp(contacts->name, BAD_CAST "contact") != 0) + goto next_contact; + callid.s = xmlGetAttrContentByName(contacts, "callid"); + if (callid.s == NULL) { + LM_ERR("No Call-ID for this contact!\n"); + goto next_contact; + } + callid.len = strlen(callid.s); + + event = reginfo_parse_event(xmlGetAttrContentByName(contacts, "event")); + if (event == EVENT_UNKNOWN) { + LM_ERR("No event for this contact!\n"); + goto next_contact; + } + expires_char = xmlGetAttrContentByName(contacts, "expires"); + if (expires_char == NULL) { + LM_ERR("No expires for this contact!\n"); + goto next_contact; } - contact_uri.len = strlen(contact_uri.s); - LM_ERR("Contact: %.*s\n", - contact_uri.len, contact_uri.s); + expires = atoi(expires_char); + if (expires < 0) { + LM_ERR("No valid expires for this contact!\n"); + goto next_contact; + } + LM_DBG("%.*s: Event \"%d\", expires %d\n", + callid.len, callid.s, event, expires); + + cseq_char = xmlGetAttrContentByName(contacts, "cseq"); + if (cseq_char == NULL) { + LM_WARN("No cseq for this contact!\n"); + } else { + cseq = atoi(cseq_char); + if (cseq < 0) { + LM_WARN("No valid cseq for this contact!\n"); + } + } + + /* Now lets process the URI's from this Contact: */ + uris = contacts->children; + while (uris) { + if (xmlStrcasecmp(uris->name, BAD_CAST "uri") != 0) + goto next_uri; + contact_uri.s = (char*)xmlNodeGetContent(uris); + if (contact_uri.s == NULL) { + LM_ERR("No URI for this contact!\n"); + goto next_registration; + } + contact_uri.len = strlen(contact_uri.s); + LM_DBG("Contact: %.*s\n", + contact_uri.len, contact_uri.s); + + /* Process the result */ + if (final_result != RESULT_CONTACTS_FOUND) final_result = result; next_uri: - uris = uris->next; - } + uris = uris->next; + } next_contact: - contacts = contacts->next; + contacts = contacts->next; + } } next_registration: + if (ul_record) ul.release_urecord(ul_record); + /* Unlock the domain for this AOR: */ + ul.unlock_udomain(domain, &parsed_aor.user); + registrations = registrations->next; } - /* Free the XML-Document */ - if(doc) xmlFreeDoc(doc); - - return 1; error: /* Free the XML-Document */ if(doc) xmlFreeDoc(doc); - return -1; + return final_result; } int reginfo_handle_notify(struct sip_msg* msg, char* domain, char* s2) { str body; + int result = 0; /* If not done yet, parse the whole message now: */ if (parse_headers(msg, HDR_EOH_F, 0) == -1) { @@ -252,6 +341,8 @@ int reginfo_handle_notify(struct sip_msg* msg, char* domain, char* s2) { LM_DBG("Body is %.*s\n", body.len, body.s); - return process_body(body, (udomain_t*)domain); + result = process_body(body, (udomain_t*)domain); + + return result; }

13 years, 7 months

git:carstenbock/ims: Merge branch 'carstenbock/ims' of ssh://git.sip-router .org/sip-router into carstenbock/ims

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: b901a4652d399edb72070bbaa850768b104e751d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b901a46… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Apr 6 18:14:38 2011 +0200 Merge branch 'carstenbock/ims' of ssh://git.sip-router.org/sip-router into carstenbock/ims ---

13 years, 7 months

git:carstenbock/ims: - Update XML for creating database schemas ( thanks to Henning Westerholt for notifying me)

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 09a96e1e82ca215b6ae713ea9a5765070ee8ac5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09a96e1… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Mar 30 15:49:37 2011 +0200 - Update XML for creating database schemas (thanks to Henning Westerholt for notifying me) --- lib/srdb1/schema/location.xml | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index 1411899..d961a35 100644 --- a/lib/srdb1/schema/location.xml +++ b/lib/srdb1/schema/location.xml @@ -9,7 +9,7 @@ <table id="location" xmlns:db="http://docbook.org/ns/docbook"> <name>location</name> - <version>1004</version> + <version>1005</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Persistent user location information for the usrloc module. More information can be found at: &KAMAILIO_MOD_DOC;usrloc.html @@ -153,6 +153,15 @@ <description>Flags that indicate the SIP Methods this contact will accept.</description> </column> + <column> + <name>reg_avps</name> + <type>string</type> + <size>255</size> + <null/> + <default><null/></default> + <description>Socket used to connect to Kamailio. For example: UDP:IP:PORT</description> + </column> + <index> <name>account_contact_idx</name> <colref linkend="username"/>

13 years, 7 months

git:carstenbock/ims: - added a note, that this functionality is under construction.

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 03241e322c820a0a8f2cb3796d229f919f907ff1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03241e3… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Mar 30 14:40:39 2011 +0200 - added a note, that this functionality is under construction. --- modules_k/registrar/doc/registrar_admin.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml index b809338..dd1e853 100644 --- a/modules_k/registrar/doc/registrar_admin.xml +++ b/modules_k/registrar/doc/registrar_admin.xml @@ -636,6 +636,11 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") Default value is NULL (disabled). </emphasis> </para> + <para> + <emphasis> + THIS FUNCTIONALITY IS UNDER CONSTRUCTION. + </emphasis> + </para> <example> <title>Set <varname>reg_avp</varname> parameter</title> <programlisting format="linespecific">

13 years, 7 months

[tracker] Comment added: Kamailio 3.1.3 crash

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#122 - Kamailio 3.1.3 crash User who did this - Daniel-Constantin Mierla (miconda) ---------- Try to call dlg_get(...) first in the event route: http://kamailio.org/docs/modules/stable/modules_k/dialog.html#id2966190 ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=122#comment194 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.

13 years, 7 months

[tracker] Comment added: Kamailio 3.1.3 crash

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#122 - Kamailio 3.1.3 crash User who did this - Jasmin Schnatterbeck (jasmin) ---------- thanks for your support! I just changed mi_datagram.c and tested again. Kamailio does not crash anymore :-) But unfortunately the $dlg variables are still not set... Is there any option to make some changes in the dialog module that it exports the necessary elements? Jasmin ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=122#comment193 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.

13 years, 7 months

[tracker] Comment added: Kamailio 3.1.3 crash

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#122 - Kamailio 3.1.3 crash User who did this - marius zbihlei (marius.zbihlei) ---------- it seems not, you can't use exec module from there.( This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. ). Also I think the dlg problem is related. I will start another bug with the generic bug description. Marius ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=122#comment192 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.

13 years, 7 months

[tracker] Comment added: Kamailio 3.1.3 crash

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#122 - Kamailio 3.1.3 crash User who did this - Daniel-Constantin Mierla (miconda) ---------- The issue here is that the mi_* modules create their own extra processes which do not call child_init functions from other modules unless those modules export a MI child init function through an exported MI command. It is not the case to sqlops. you can try to change in: modules_k/mi_datagram/mi_datagram.c line 280: pid=fork_process(PROC_NOCHLDINIT, "MI DATAGRAM", 1); to: pid=fork_process(PROC_RPC, "MI DATAGRAM", 1); It might have side effects, though. When I have some time, if nobody else does it meanwhile, I will try to solve this issue with extra MI processes and the modules that don't export MI commands. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=122#comment191 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.

13 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011