sr-dev June 2010

sr-dev@lists.kamailio.org

26 participants
164 discussions

git:master: db_postgres(old API) FS#77: fix BLOBs with postgres
by Henning Westerholt 29 Jun '10

29 Jun '10

Module: sip-router Branch: master Commit: 2e56720769913c55cacc83fe3a31f44f072e7590 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e56720… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 29 18:11:58 2010 +0200 db_postgres(old API) FS#77: fix BLOBs with postgres fix BLOBs with postgres, also add a null-termination as the other SQL databases in order to be able to work with the presence modules --- modules/db_postgres/km_val.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index cb3fe9f..9faa5b5 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -72,16 +72,18 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const LM_ERR("PQunescapeBytea failed\n"); return -7; } - VAL_BLOB(_v).s = pkg_malloc(VAL_BLOB(_v).len); + VAL_BLOB(_v).s = pkg_malloc(VAL_BLOB(_v).len + 1); if (VAL_BLOB(_v).s == NULL) { LM_ERR("no private memory left\n"); PQfreemem(tmp_s); return -8; } - LM_DBG("allocate %d bytes memory for BLOB at %p", VAL_BLOB(_v).len, VAL_BLOB(_v).s); + LM_DBG("allocate %d bytes memory for BLOB at %p", VAL_BLOB(_v).len + 1, VAL_BLOB(_v).s); memcpy(VAL_BLOB(_v).s, tmp_s, VAL_BLOB(_v).len); PQfreemem(tmp_s); + VAL_BLOB(_v).s[VAL_BLOB(_v).len] = '\0'; + VAL_BLOB(_v).len++; VAL_TYPE(_v) = DB1_BLOB; VAL_FREE(_v) = 1;

1 0

SF.net SVN: openser:[6013] branches/1.5/modules/db_postgres/val.c
by Henning Westerholt 29 Jun '10

29 Jun '10

Revision: 6013 http://openser.svn.sourceforge.net/openser/?rev=6013&view=rev Author: henningw Date: 2010-06-29 16:08:26 +0000 (Tue, 29 Jun 2010) Log Message: ----------- * FS#77: fix BLOBs with postgres, also add a null-termination as the other SQL databases in order to be able to work with the presence modules Modified Paths: -------------- branches/1.5/modules/db_postgres/val.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: modules_k: dialog and qos - add context info to dlg rpc commands
by Ovidiu Sas 29 Jun '10

29 Jun '10

Module: sip-router Branch: master Commit: a2f7b089506bbb32b76d81d787eab0d9d9c8168e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2f7b08… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Jun 29 11:28:26 2010 -0400 modules_k: dialog and qos - add context info to dlg rpc commands - context info for dialog rpc commands is now implemented --- modules_k/dialog/dialog.c | 6 +++- modules_k/qos/qos_handlers.c | 71 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index f00021e..a7e34a2 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -1120,6 +1120,8 @@ struct mi_root * mi_dlg_bridge(struct mi_root *cmd_tree, void *param) */ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, struct dlg_cell *dlg, int with_context) { + rpc_cb_ctx_t rpc_cb; + rpc->printf(c, "hash:%u:%u state:%u timestart:%u timeout:%u", dlg->h_entry, dlg->h_id, dlg->state, dlg->start_ts, dlg->tl.timeout); rpc->printf(c, "\tcallid:%.*s from_tag:%.*s to_tag:%.*s", @@ -1147,7 +1149,9 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, struct dlg_cell * dlg->bind_addr[DLG_CALLER_LEG]->sock_str.len, dlg->bind_addr[DLG_CALLER_LEG]->sock_str.s); } if (with_context) { - run_dlg_callbacks( DLGCB_RPC_CONTEXT, dlg, NULL, DLG_DIR_NONE, NULL); + rpc_cb.rpc = rpc; + rpc_cb.c = c; + run_dlg_callbacks( DLGCB_RPC_CONTEXT, dlg, NULL, DLG_DIR_NONE, (void *)&rpc_cb); } } diff --git a/modules_k/qos/qos_handlers.c b/modules_k/qos/qos_handlers.c index 85416ba..b832cd9 100644 --- a/modules_k/qos/qos_handlers.c +++ b/modules_k/qos/qos_handlers.c @@ -283,19 +283,86 @@ static void qos_dialog_response_CB(struct dlg_cell* did, int type, struct dlg_cb } /********************************* RPC *********************************/ +static inline void internal_rpc_print_qos_stream_payloads(rpc_t *rpc, void *c, sdp_stream_cell_t* stream) +{ + int i; + sdp_payload_attr_t *sdp_payload = stream->payload_attr; + + for(i=stream->payloads_num-1;i>=0;i--){ + if (!sdp_payload) { + LM_ERR("got NULL sdp_payload\n"); + return; + } + rpc->printf(c, "\t\t\t\tpayload[%d]=%.*s codec=%.*s", + i, sdp_payload->rtp_payload.len, sdp_payload->rtp_payload.s, + sdp_payload->rtp_enc.len, sdp_payload->rtp_enc.s); + sdp_payload = sdp_payload->next; + } +} +static inline void internal_rpc_print_qos_stream(rpc_t *rpc, void *c, sdp_session_cell_t* session) +{ + int i; + sdp_stream_cell_t *stream = session->streams; + + for(i=session->streams_num-1;i>=0;i--){ + if (!stream) { + LM_ERR("got NULL stream\n"); + return; + } + rpc->printf(c, "\t\t\tmedia=%.*s IP:port=%.*s:%.*s trans=%.*s sendrecv=%.*s ptime=%.*s payload:%d", + stream->media.len, stream->media.s, + stream->ip_addr.len, stream->ip_addr.s, + stream->port.len, stream->port.s, + stream->transport.len, stream->transport.s, + stream->sendrecv_mode.len, stream->sendrecv_mode.s, + stream->ptime.len, stream->ptime.s, + stream->payloads_num); + internal_rpc_print_qos_stream_payloads(rpc, c, stream); + stream = stream->next; + } +} +static inline void internal_rpc_print_qos(rpc_t *rpc, void *c, qos_sdp_t *qos_sdp) +{ + int i; + sdp_session_cell_t *session; + + rpc->printf(c, "\t\tm_dir=%u m_id=%u method=%.*s cseq=%.*s negotiation=%u", + qos_sdp->method_dir, qos_sdp->method_id, + qos_sdp->method.len, qos_sdp->method.s, + qos_sdp->cseq.len, qos_sdp->cseq.s, qos_sdp->negotiation); + + for (i=1;i>=0;i--){ + session = qos_sdp->sdp_session[i]; + if (session) { + rpc->printf(c, "\t\tcalle%s: cnt_disp=%.*s bw_type=%.*s bw_width=%.*s", + i?"e":"r", + session->cnt_disp.len, session->cnt_disp.s, + session->bw_type.len, session->bw_type.s, + session->bw_width.len, session->bw_width.s); + internal_rpc_print_qos_stream(rpc, c, session); + } + } +} + void qos_dialog_rpc_context_CB(struct dlg_cell* did, int type, struct dlg_cb_params * params) { + rpc_cb_ctx_t *rpc_cb = (rpc_cb_ctx_t*)(params->dlg_data); + rpc_t *rpc = rpc_cb->rpc; + void *c = rpc_cb->c; + qos_ctx_t* qos_ctx = (qos_ctx_t*)*(params->param); qos_sdp_t* qos_sdp; qos_sdp = qos_ctx->pending_sdp; if (qos_sdp) { - /* print pendign sdp context */ + rpc->printf(c, "\tqos:pending_sdp"); + internal_rpc_print_qos(rpc, c, qos_sdp); } qos_sdp = qos_ctx->negotiated_sdp; if (qos_sdp) { - /* print negotiated sdp context */ + rpc->printf(c, "\tqos:negotiated_sdp"); + internal_rpc_print_qos(rpc, c, qos_sdp); } return;

1 0

git:master: Merge branch 'master' of ssh://osas@git.sip-router.org/ sip-router
by Ovidiu Sas 29 Jun '10

29 Jun '10

Module: sip-router Branch: master Commit: 3a648a8bb05e891e52ca759ffc78c5f1807f6d1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a648a8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Jun 29 10:09:27 2010 -0400 Merge branch 'master' of ssh://osas@git.sip-router.org/sip-router * 'master' of ssh://osas@git.sip-router.org/sip-router: auc(k): fix error in authentification: Digest should be compared case insensitive ---

1 0

git:master: core: rpc - adding rpc_cb_ctx_t
by Ovidiu Sas 29 Jun '10

29 Jun '10

Module: sip-router Branch: master Commit: e5e03e8589851f3b115f8aca7dea40a34c597416 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5e03e8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Jun 29 09:53:05 2010 -0400 core: rpc - adding rpc_cb_ctx_t - rpc_cb_ctx_t is a convenient way of packing an rpc callback (rpc_function_t) parameters and it's not used/needed by the rpc api/interface. --- rpc.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/rpc.h b/rpc.h index 1434146..addc8c8 100644 --- a/rpc.h +++ b/rpc.h @@ -95,6 +95,18 @@ typedef struct rpc_delayed_ctx{ typedef void (*rpc_function_t)(rpc_t* rpc, void* ctx); +/* + * RPC callback context. + * + * Defines a convenient way of packing an rpc callback + * (rpc_function_t) parameters and it's not used/needed + * by the rpc api/interface. + */ +typedef struct rpc_cb_ctx { + rpc_t *rpc; + void *c; +} rpc_cb_ctx_t; + /* * Remote Procedure Call Export

1 0

git:kamailio_3.0: auc(k): fix error in authentification: Digest should be compared case insensitive
by Marius Zbihlei 29 Jun '10

29 Jun '10

Module: sip-router Branch: kamailio_3.0 Commit: 96d8f8335587d35b6a2b887f597fdc68de799875 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96d8f83… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jun 29 12:26:30 2010 +0200 auc(k): fix error in authentification: Digest should be compared case insensitive (cherry picked from commit 3f5909fd3ca55aa43148d81a8874eaeaeaf91968) --- modules_k/uac/auth_hdr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/uac/auth_hdr.c b/modules_k/uac/auth_hdr.c index 269f0bb..c8fd359 100644 --- a/modules_k/uac/auth_hdr.c +++ b/modules_k/uac/auth_hdr.c @@ -112,7 +112,7 @@ int parse_authenticate_body( str *body, struct authenticate_body *auth) while (p<end && isspace((int)*p)) p++; if (p+AUTHENTICATE_DIGEST_LEN>=end ) goto parse_error; - if (strncmp(p,AUTHENTICATE_DIGEST_S,AUTHENTICATE_DIGEST_LEN)!=0) + if (strncasecmp(p,AUTHENTICATE_DIGEST_S,AUTHENTICATE_DIGEST_LEN)!=0) goto parse_error; p += AUTHENTICATE_DIGEST_LEN; if (!isspace((int)*p))

3 3

rpc: inter module rpc printf callback structure
by Ovidiu Sas 29 Jun '10

29 Jun '10

Hello all, I need to pass the rpc printf params between two modules via a callback functions. The current implementation allows passing a pointer during the callback call and I would like to reuse the existing callback pointer to pass a everything that I need through it. I would like to define a new structure for rpc and pass a pointer to that structure during the callback call: diff --git a/rpc.h b/rpc.h index 1434146..ff66b5a 100644 --- a/rpc.h +++ b/rpc.h @@ -88,6 +88,10 @@ typedef struct rpc_delayed_ctx{ /* more private data might follow */ } rpc_delayed_ctx_t; +typedef struct rpc_cb_ctx { + rpc_t *rpc; + void *c; +} rpc_cb_ctx_t; /* * RPC Function Prototype This will allow printing mixed info from different modules, in my particular case, printing qos context info along with dialog context info (modules_k: dialog and qos). Since I'm not familiar with the rpc interface, please advice if this is the right way of doing it or if there is another better alternative. Regards, Ovidiu Sas

2 4

git:master: auc(k): fix error in authentification: Digest should be compared case insensitive
by Henning Westerholt 29 Jun '10

29 Jun '10

Module: sip-router Branch: master Commit: 3f5909fd3ca55aa43148d81a8874eaeaeaf91968 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f5909f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 29 12:26:30 2010 +0200 auc(k): fix error in authentification: Digest should be compared case insensitive --- modules_k/uac/auth_hdr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/uac/auth_hdr.c b/modules_k/uac/auth_hdr.c index 350fea4..793cfbc 100644 --- a/modules_k/uac/auth_hdr.c +++ b/modules_k/uac/auth_hdr.c @@ -112,7 +112,7 @@ int parse_authenticate_body( str *body, struct authenticate_body *auth) while (p<end && isspace((int)*p)) p++; if (p+AUTHENTICATE_DIGEST_LEN>=end ) goto parse_error; - if (strncmp(p,AUTHENTICATE_DIGEST_S,AUTHENTICATE_DIGEST_LEN)!=0) + if (strncasecmp(p,AUTHENTICATE_DIGEST_S,AUTHENTICATE_DIGEST_LEN)!=0) goto parse_error; p += AUTHENTICATE_DIGEST_LEN; if (!isspace((int)*p))

1 0

SF.net SVN: openser:[6012] branches/1.5/modules/uac/auth_hdr.c
by Henning Westerholt 29 Jun '10

29 Jun '10

Revision: 6012 http://openser.svn.sourceforge.net/openser/?rev=6012&view=rev Author: henningw Date: 2010-06-29 10:23:49 +0000 (Tue, 29 Jun 2010) Log Message: ----------- * fix error in authentification: Digest should be compared case insensitive reported from J?\195?\161n ONDREJ (SAL), ondrejj at salstar dot sk Modified Paths: -------------- branches/1.5/modules/uac/auth_hdr.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: core: sdp parser - fix the extraction of connection stream IP
by Ovidiu Sas 28 Jun '10

28 Jun '10

Module: sip-router Branch: master Commit: 10ba00838420a78c2cd6c2e99d8c5217b713a918 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10ba008… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Jun 28 19:05:31 2010 -0400 core: sdp parser - fix the extraction of connection stream IP --- parser/sdp/sdp.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index b4dd062..d3e6f85 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -340,7 +340,8 @@ sdp_payload_attr_t* get_sdp_payload4index(sdp_stream_cell_t *stream, int index) static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_info_t* _sdp) { str body = *sdp_body; - str sdp_ip, sdp_media, sdp_port, sdp_transport, sdp_payload; + str sdp_ip = {NULL,0}; + str sdp_media, sdp_port, sdp_transport, sdp_payload; str payload; str rtp_payload, rtp_enc, rtp_clock, rtp_params; int is_rtp; @@ -399,6 +400,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ c1p = find_sdp_line(o1p, m1p, 'c'); if (c1p) { + /* Extract session address */ tmpstr1.s = c1p; tmpstr1.len = bodylimit - tmpstr1.s; /* limit is session limit text */ if (extract_mediaip(&tmpstr1, &session->ip_addr, &session->pf,"c=") == -1) { @@ -427,19 +429,20 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ /* c2p will point to per-media "c=" */ c2p = find_sdp_line(m1p, m2p, 'c'); - /* Extract address and port */ - tmpstr1.s = c2p ? c2p : c1p; - if (tmpstr1.s == NULL) { - /* No "c=" */ - LM_ERR("can't find media IP in the message\n"); - return -1; - } - - /* Extract the IP on sdp_ip */ - tmpstr1.len = bodylimit - tmpstr1.s; /* limit is session limit text */ - if (extract_mediaip(&tmpstr1, &sdp_ip, &pf,"c=") == -1) { - LM_ERR("can't extract media IP from the message\n"); - return -1; + if (c2p) { + /* Extract stream address */ + tmpstr1.s = c2p; + tmpstr1.len = bodylimit - tmpstr1.s; /* limit is session limit text */ + if (extract_mediaip(&tmpstr1, &sdp_ip, &pf,"c=") == -1) { + LM_ERR("can't extract media IP from the message\n"); + return -1; + } + } else { + if (!c1p) { + /* No "c=" */ + LM_ERR("can't find media IP in the message\n"); + return -1; + } } /* Extract the port on sdp_port */ @@ -800,9 +803,11 @@ void print_sdp_session(sdp_session_cell_t *session, int log_level) return; } - LOG(log_level, "..session[%d]:%p=>%p '%.*s' '%.*s:%.*s' (%d)=>%p\n", + LOG(log_level, "..session[%d]:%p=>%p '%.*s' '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p\n", session->session_num, session, session->next, session->cnt_disp.len, session->cnt_disp.s, + session->ip_addr.len, session->ip_addr.s, + session->o_ip_addr.len, session->o_ip_addr.s, session->bw_type.len, session->bw_type.s, session->bw_width.len, session->bw_width.s, session->streams_num, session->streams); while (stream) {

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 June 2010