sr-dev June 2010

sr-dev@lists.kamailio.org

26 participants
164 discussions

git:master: core: sdp parser - the log verbosity of sdp print helpers is now configurable
by Ovidiu Sas 28 Jun '10

28 Jun '10

Module: sip-router Branch: master Commit: 986e8c19b4a66280f7e856174c375b12b791d3f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=986e8c1… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Jun 28 12:17:07 2010 -0400 core: sdp parser - the log verbosity of sdp print helpers is now configurable --- parser/sdp/sdp.c | 18 +++++++++--------- parser/sdp/sdp.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index d294d11..b4dd062 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -758,11 +758,11 @@ void free_sdp(sdp_info_t** _sdp) } -void print_sdp_stream(sdp_stream_cell_t *stream) +void print_sdp_stream(sdp_stream_cell_t *stream, int log_level) { sdp_payload_attr_t *payload; - LM_DBG("....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' [%d] '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", + LOG(log_level , "....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' [%d] '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", stream->stream_num, stream, stream->next, stream->p_payload_attr, stream->media.len, stream->media.s, @@ -780,7 +780,7 @@ void print_sdp_stream(sdp_stream_cell_t *stream) stream->accept_wrapped_types.len, stream->accept_wrapped_types.s); payload = stream->payload_attr; while (payload) { - LM_DBG("......payload[%d]:%p=>%p p_payload_attr[%d]:%p '%.*s' '%.*s' '%.*s' '%.*s'\n", + LOG(log_level, "......payload[%d]:%p=>%p p_payload_attr[%d]:%p '%.*s' '%.*s' '%.*s' '%.*s'\n", payload->payload_num, payload, payload->next, payload->payload_num, stream->p_payload_attr[payload->payload_num], payload->rtp_payload.len, payload->rtp_payload.s, @@ -791,7 +791,7 @@ void print_sdp_stream(sdp_stream_cell_t *stream) } } -void print_sdp_session(sdp_session_cell_t *session) +void print_sdp_session(sdp_session_cell_t *session, int log_level) { sdp_stream_cell_t *stream = session->streams; @@ -800,26 +800,26 @@ void print_sdp_session(sdp_session_cell_t *session) return; } - LM_DBG("..session[%d]:%p=>%p '%.*s' '%.*s:%.*s' (%d)=>%p\n", + LOG(log_level, "..session[%d]:%p=>%p '%.*s' '%.*s:%.*s' (%d)=>%p\n", session->session_num, session, session->next, session->cnt_disp.len, session->cnt_disp.s, session->bw_type.len, session->bw_type.s, session->bw_width.len, session->bw_width.s, session->streams_num, session->streams); while (stream) { - print_sdp_stream(stream); + print_sdp_stream(stream, log_level); stream=stream->next; } } -void print_sdp(sdp_info_t* sdp) +void print_sdp(sdp_info_t* sdp, int log_level) { sdp_session_cell_t *session; - LM_DBG("sdp:%p=>%p (%d:%d)\n", sdp, sdp->sessions, sdp->sessions_num, sdp->streams_num); + LOG(log_level, "sdp:%p=>%p (%d:%d)\n", sdp, sdp->sessions, sdp->sessions_num, sdp->streams_num); session = sdp->sessions; while (session) { - print_sdp_session(session); + print_sdp_session(session, log_level); session = session->next; } } diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index 2ab34de..c7cc866 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -159,19 +159,19 @@ void free_sdp(sdp_info_t** _sdp); * * Note: only for debug purposes. */ -void print_sdp(sdp_info_t* sdp); +void print_sdp(sdp_info_t* sdp, int log_level); /** * Print the content of the given sdp_session structure. * * Note: only for debug purposes. */ -void print_sdp_session(sdp_session_cell_t* sdp_session); +void print_sdp_session(sdp_session_cell_t* sdp_session, int log_level); /** * Print the content of the given sdp_stream structure. * * Note: only for debug purposes. */ -void print_sdp_stream(sdp_stream_cell_t *stream); +void print_sdp_stream(sdp_stream_cell_t *stream, int log_level); #endif /* SDP_H */

1 0

git:master: core: sdp parser - add rtp flag identifier for sdp streams
by Ovidiu Sas 28 Jun '10

28 Jun '10

Module: sip-router Branch: master Commit: 6face3f2b282333f241cb28782874cfa5dee495b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6face3f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Jun 28 12:04:26 2010 -0400 core: sdp parser - add rtp flag identifier for sdp streams --- parser/sdp/sdp.c | 16 +++++++++++----- parser/sdp/sdp.h | 2 ++ parser/sdp/sdp_helpr_funcs.c | 30 +++++++++++++++++++----------- parser/sdp/sdp_helpr_funcs.h | 3 ++- 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index e6721a7..d294d11 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -4,6 +4,7 @@ * SDP parser interface * * Copyright (C) 2008-2009 SOMA Networks, INC. + * Copyright (C) 2010 VoIP Embedded, Inc * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -92,7 +93,7 @@ static inline sdp_session_cell_t *add_sdp_session(sdp_info_t* _sdp, int session_ * Allocate a new stream cell. */ static inline sdp_stream_cell_t *add_sdp_stream(sdp_session_cell_t* _session, int stream_num, - str* media, str* port, str* transport, str* payloads, int pf, str* sdp_ip) + str* media, str* port, str* transport, str* payloads, int is_rtp, int pf, str* sdp_ip) { sdp_stream_cell_t *stream; int len; @@ -116,6 +117,8 @@ static inline sdp_stream_cell_t *add_sdp_stream(sdp_session_cell_t* _session, in stream->payloads.s = payloads->s; stream->payloads.len = payloads->len; + stream->is_rtp = is_rtp; + stream->pf = pf; stream->ip_addr.s = sdp_ip->s; stream->ip_addr.len = sdp_ip->len; @@ -340,6 +343,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ str sdp_ip, sdp_media, sdp_port, sdp_transport, sdp_payload; str payload; str rtp_payload, rtp_enc, rtp_clock, rtp_params; + int is_rtp; char *bodylimit; char *v1p, *o1p, *m1p, *m2p, *c1p, *c2p, *a1p, *a2p, *b1p; str tmpstr1; @@ -441,13 +445,13 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ /* Extract the port on sdp_port */ tmpstr1.s = m1p; tmpstr1.len = m2p - m1p; - if (extract_media_attr(&tmpstr1, &sdp_media, &sdp_port, &sdp_transport, &sdp_payload) == -1) { + if (extract_media_attr(&tmpstr1, &sdp_media, &sdp_port, &sdp_transport, &sdp_payload, &is_rtp) == -1) { LM_ERR("can't extract media attr from the message\n"); return -1; } /* Allocate a stream cell */ - stream = add_sdp_stream(session, stream_num, &sdp_media, &sdp_port, &sdp_transport, &sdp_payload, pf, &sdp_ip); + 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; /* increment total number of streams */ @@ -758,13 +762,13 @@ void print_sdp_stream(sdp_stream_cell_t *stream) { sdp_payload_attr_t *payload; - LM_DBG("....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", + LM_DBG("....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' [%d] '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", stream->stream_num, stream, stream->next, stream->p_payload_attr, stream->media.len, stream->media.s, stream->ip_addr.len, stream->ip_addr.s, stream->port.len, stream->port.s, stream->rtcp_port.len, stream->rtcp_port.s, - stream->transport.len, stream->transport.s, + stream->transport.len, stream->transport.s, stream->is_rtp, stream->payloads.len, stream->payloads.s, stream->bw_type.len, stream->bw_type.s, stream->bw_width.len, stream->bw_width.s, stream->payloads_num, stream->payload_attr, @@ -985,6 +989,8 @@ sdp_stream_cell_t * clone_sdp_stream_cell(sdp_stream_cell_t *stream) p += stream->ip_addr.len; } + clone_stream->is_rtp = stream->is_rtp; + if (stream->media.len) { clone_stream->media.s = p; clone_stream->media.len = stream->media.len; diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index 0e9f19c..2ab34de 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -4,6 +4,7 @@ * SDP parser interface * * Copyright (C) 2008-2009 SOMA Networks, INC. + * Copyright (C) 2010 VoIP Embedded, Inc * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -48,6 +49,7 @@ typedef struct sdp_stream_cell { int pf; /**< connection address family: AF_INET/AF_INET6 */ str ip_addr; /**< connection address */ int stream_num; /**< stream index inside a session */ + int is_rtp; /**< flag indicating is this is an RTP stream */ /* m=<media> <port> <transport> <payloads> */ str media; str port; diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 681dd23..90a19fe 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -4,6 +4,7 @@ * SDP parser helpers * * Copyright (C) 2008-2009 SOMA Networks, INC. + * Copyright (C) 2010 VoIP Embedded, Inc * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -34,14 +35,19 @@ #include "../parse_hname2.h" -static str sup_ptypes[] = { - str_init("udp"), - str_init("udptl"), - str_init("rtp/avp"), - str_init("rtp/savpf"), - str_init("TCP/MSRP"), - str_init("TCP/TLS/MSRP"), - { NULL, 0} +static struct { + const char *s; + int len; + int is_rtp; +} sup_ptypes[] = { + {.s = "rtp/avp", .len = 7, .is_rtp = 1}, + {.s = "udptl", .len = 5, .is_rtp = 0}, + {.s = "rtp/avpf", .len = 8, .is_rtp = 1}, + {.s = "rtp/savp", .len = 8, .is_rtp = 1}, + {.s = "rtp/savpf", .len = 9, .is_rtp = 1}, + {.s = "udp", .len = 3, .is_rtp = 0}, + {.s = "udp/bfcp", .len = 8, .is_rtp = 0}, + {.s = NULL, .len = 0, .is_rtp = 0} }; @@ -385,7 +391,7 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) return 1; } -int extract_media_attr(str *body, str *mediamedia, str *mediaport, str *mediatransport, str *mediapayload) +int extract_media_attr(str *body, str *mediamedia, str *mediaport, str *mediatransport, str *mediapayload, int *is_rtp) { char *cp, *cp1; int len, i; @@ -462,10 +468,12 @@ int extract_media_attr(str *body, str *mediamedia, str *mediaport, str *mediatra for (i = 0; sup_ptypes[i].s != NULL; i++) if (mediatransport->len == sup_ptypes[i].len && - strncasecmp(mediatransport->s, sup_ptypes[i].s, mediatransport->len) == 0) + strncasecmp(mediatransport->s, sup_ptypes[i].s, mediatransport->len) == 0) { + *is_rtp = sup_ptypes[i].is_rtp; return 0; + } /* Unproxyable protocol type. Generally it isn't error. */ - return -1; + return 0; } diff --git a/parser/sdp/sdp_helpr_funcs.h b/parser/sdp/sdp_helpr_funcs.h index d7b02ee..0456993 100644 --- a/parser/sdp/sdp_helpr_funcs.h +++ b/parser/sdp/sdp_helpr_funcs.h @@ -4,6 +4,7 @@ * SDP parser helpers * * Copyright (C) 2008-2009 SOMA Networks, INC. + * Copyright (C) 2010 VoIP Embedded, Inc * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -47,7 +48,7 @@ int extract_rtpmap(str *body, str *rtpmap_payload, str *rtpmap_encoding, str *rt int extract_ptime(str *body, str *ptime); int extract_sendrecv_mode(str *body, str *sendrecv_mode); int extract_mediaip(str *body, str *mediaip, int *pf, char *line); -int extract_media_attr(str *body, str *mediamedia, str *mediaport, str *mediatransport, str *mediapayload); +int extract_media_attr(str *body, str *mediamedia, str *mediaport, str *mediatransport, str *mediapayload, int *is_rtp); int extract_bwidth(str *body, str *bwtype, str *bwwitdth); /* RFC3605 attributes */

1 0

job offer: VoIP developer, team Karlsruhe
by Henning Westerholt 28 Jun '10

28 Jun '10

Job offer: Interested in working with one of the biggest Voice over IP networks in europe? We're hiring and have one additional VoIP developer position open in our team in Karlsruhe, Germany at the moment. For more informations (requirements, how to apply..) please refer to the opening on the job web page. Some facts about our VoIP system can be found at e.g. [1], please feel free to contact me per mail as well. http://www.united-internet.de/xml/ui/JobsJobDetail;?__lf=JobsApplication200… Best regards, Henning Westerholt [1] http://www.kamailio.org/events/2010-linuxtag/presentation.pdf -- Henning Westerholt - Technical Leader VoIP backend development 1&1 Internet AG, Ernst-Frey-Str. 9, 76135 Karlsruhe, Germany

3 4

git:master: core: sdp parser - log reformating
by Ovidiu Sas 28 Jun '10

28 Jun '10

Module: sip-router Branch: master Commit: cc10916886a583136bb608f6048b4f1c4eca2564 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc10916… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Jun 28 09:59:47 2010 -0400 core: sdp parser - log reformating - cosmetic change of a log while printing the parsed sdp stream --- parser/sdp/sdp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index f0e490f..e6721a7 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -758,7 +758,7 @@ void print_sdp_stream(sdp_stream_cell_t *stream) { sdp_payload_attr_t *payload; - LM_DBG("....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s' [%.*s] '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", + LM_DBG("....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", stream->stream_num, stream, stream->next, stream->p_payload_attr, stream->media.len, stream->media.s,

1 0

git:master: modules_k:qos align qos module to the new sdp layout
by Ovidiu Sas 28 Jun '10

28 Jun '10

Module: sip-router Branch: master Commit: b123419e493dbe938cec57ffa8850dbab5255ad5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b123419… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Jun 28 09:57:42 2010 -0400 modules_k:qos align qos module to the new sdp layout - 'sendrecv_mode' and 'ptime' are session attributes now --- modules_k/qos/qos_mi.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules_k/qos/qos_mi.c b/modules_k/qos/qos_mi.c index 1b513e4..6644a85 100644 --- a/modules_k/qos/qos_mi.c +++ b/modules_k/qos/qos_mi.c @@ -56,18 +56,6 @@ int add_mi_sdp_payload_nodes(struct mi_node* node, int index, sdp_payload_attr_t return 1; } - if (sdp_payload->sendrecv_mode.s!=NULL && sdp_payload->sendrecv_mode.len!=0) { - attr = add_mi_attr(node1, MI_DUP_VALUE, "sendrecv", 8, sdp_payload->sendrecv_mode.s, sdp_payload->sendrecv_mode.len); - if(attr == NULL) - return 1; - } - - if (sdp_payload->ptime.s!=NULL && sdp_payload->ptime.len!=0) { - attr = add_mi_attr(node1, MI_DUP_VALUE, "ptime", 5, sdp_payload->ptime.s, sdp_payload->ptime.len); - if(attr == NULL) - return 1; - } - return 0; } @@ -100,6 +88,18 @@ int add_mi_stream_nodes(struct mi_node* node, int index, sdp_stream_cell_t* stre if(attr == NULL) return 1; + if (stream->sendrecv_mode.s!=NULL && stream->sendrecv_mode.len!=0) { + attr = add_mi_attr(node1, MI_DUP_VALUE, "sendrecv", 8, stream->sendrecv_mode.s, stream->sendrecv_mode.len); + if(attr == NULL) + return 1; + } + + if (stream->ptime.s!=NULL && stream->ptime.len!=0) { + attr = add_mi_attr(node1, MI_DUP_VALUE, "ptime", 5, stream->ptime.s, stream->ptime.len); + if(attr == NULL) + return 1; + } + p = int2str((unsigned long)(stream->payloads_num), &len); attr = add_mi_attr(node1, MI_DUP_VALUE, "payloads_num", 12, p, len); if(attr == NULL)

1 0

git:master: core: sdp parser: making 'sendrecv_mode' and 'ptime' session attributes
by Ovidiu Sas 28 Jun '10

28 Jun '10

Module: sip-router Branch: master Commit: c90ff4d4861fcd33c376122a0b0daf1ce7ca7522 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c90ff4d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Jun 28 09:54:01 2010 -0400 core: sdp parser: making 'sendrecv_mode' and 'ptime' session attributes --- parser/sdp/sdp.c | 97 +++++++++++++++--------------------------------------- parser/sdp/sdp.h | 4 +- 2 files changed, 29 insertions(+), 72 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 0b6d3e9..f0e490f 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -216,47 +216,6 @@ void set_sdp_payload_attr(sdp_payload_attr_t *payload_attr, str *rtp_enc, str *r return; } -void set_sdp_ptime_attr(sdp_stream_cell_t *stream, sdp_payload_attr_t *payload_attr, str *ptime) -{ - sdp_payload_attr_t *payload; - int i; - - if (payload_attr == 0) { - /* This is a generic attribute - * Let's update all payloads */ - for (i=0;i<stream->payloads_num;i++) { - payload = stream->p_payload_attr[i]; - payload->ptime.s = ptime->s; - payload->ptime.len = ptime->len; - } - } else { - payload_attr->ptime.s = ptime->s; - payload_attr->ptime.len = ptime->len; - } - return; -} - -void set_sdp_sendrecv_mode_attr(sdp_stream_cell_t *stream, sdp_payload_attr_t *payload_attr, str *sendrecv_mode) -{ - sdp_payload_attr_t *payload; - int i; - - if (payload_attr == 0) { - /* This is a generic attribute - * Let's update all payloads */ - for (i=0;i<stream->payloads_num;i++) { - payload = stream->p_payload_attr[i]; - payload->sendrecv_mode.s = sendrecv_mode->s; - payload->sendrecv_mode.len = sendrecv_mode->len; - } - } else { - payload_attr->sendrecv_mode.s = sendrecv_mode->s; - payload_attr->sendrecv_mode.len = sendrecv_mode->len; - } - - return; -} - /* * Getters .... */ @@ -380,7 +339,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ str body = *sdp_body; str sdp_ip, sdp_media, sdp_port, sdp_transport, sdp_payload; str payload; - str rtp_payload, rtp_enc, rtp_clock, rtp_params, ptime, sendrecv_mode; + str rtp_payload, rtp_enc, rtp_clock, rtp_params; char *bodylimit; char *v1p, *o1p, *m1p, *m2p, *c1p, *c2p, *a1p, *a2p, *b1p; str tmpstr1; @@ -543,12 +502,10 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ tmpstr1.s = a2p; tmpstr1.len = m2p - a2p; - if (parse_payload_attr && extract_ptime(&tmpstr1, &ptime) == 0) { - a1p = ptime.s + ptime.len; - set_sdp_ptime_attr(stream, payload_attr, &ptime); - } else if (parse_payload_attr && extract_sendrecv_mode(&tmpstr1, &sendrecv_mode) == 0) { - a1p = sendrecv_mode.s + sendrecv_mode.len; - set_sdp_sendrecv_mode_attr(stream, payload_attr, &sendrecv_mode); + if (parse_payload_attr && extract_ptime(&tmpstr1, &stream->ptime) == 0) { + a1p = stream->ptime.s + stream->ptime.len; + } else if (parse_payload_attr && extract_sendrecv_mode(&tmpstr1, &stream->sendrecv_mode) == 0) { + a1p = stream->sendrecv_mode.s + stream->sendrecv_mode.len; } else if (parse_payload_attr && extract_rtpmap(&tmpstr1, &rtp_payload, &rtp_enc, &rtp_clock, &rtp_params) == 0) { if (rtp_params.len != 0 && rtp_params.s != NULL) { a1p = rtp_params.s + rtp_params.len; @@ -801,7 +758,7 @@ void print_sdp_stream(sdp_stream_cell_t *stream) { sdp_payload_attr_t *payload; - LM_DBG("....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s' [%.*s] '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s'\n", + LM_DBG("....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s' [%.*s] '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", stream->stream_num, stream, stream->next, stream->p_payload_attr, stream->media.len, stream->media.s, @@ -811,21 +768,21 @@ void print_sdp_stream(sdp_stream_cell_t *stream) stream->payloads.len, stream->payloads.s, stream->bw_type.len, stream->bw_type.s, stream->bw_width.len, stream->bw_width.s, stream->payloads_num, stream->payload_attr, + stream->sendrecv_mode.len, stream->sendrecv_mode.s, + stream->ptime.len, stream->ptime.s, stream->path.len, stream->path.s, stream->max_size.len, stream->max_size.s, stream->accept_types.len, stream->accept_types.s, stream->accept_wrapped_types.len, stream->accept_wrapped_types.s); payload = stream->payload_attr; while (payload) { - LM_DBG("......payload[%d]:%p=>%p p_payload_attr[%d]:%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", + LM_DBG("......payload[%d]:%p=>%p p_payload_attr[%d]:%p '%.*s' '%.*s' '%.*s' '%.*s'\n", payload->payload_num, payload, payload->next, payload->payload_num, stream->p_payload_attr[payload->payload_num], payload->rtp_payload.len, payload->rtp_payload.s, payload->rtp_enc.len, payload->rtp_enc.s, payload->rtp_clock.len, payload->rtp_clock.s, - payload->rtp_params.len, payload->rtp_params.s, - payload->sendrecv_mode.len, payload->sendrecv_mode.s, - payload->ptime.len, payload->ptime.s); + payload->rtp_params.len, payload->rtp_params.s); payload=payload->next; } } @@ -925,9 +882,7 @@ sdp_payload_attr_t * clone_sdp_payload_attr(sdp_payload_attr_t *attr) attr->rtp_payload.len + attr->rtp_enc.len + attr->rtp_clock.len + - attr->rtp_params.len + - attr->sendrecv_mode.len + - attr->ptime.len; + attr->rtp_params.len; clone_attr = (sdp_payload_attr_t*)shm_malloc(len); if (clone_attr == NULL) { LM_ERR("no more shm mem (%d)\n",len); @@ -966,20 +921,6 @@ sdp_payload_attr_t * clone_sdp_payload_attr(sdp_payload_attr_t *attr) p += attr->rtp_params.len; } - if (attr->sendrecv_mode.len) { - clone_attr->sendrecv_mode.s = p; - clone_attr->sendrecv_mode.len = attr->sendrecv_mode.len; - memcpy( p, attr->sendrecv_mode.s, attr->sendrecv_mode.len); - p += attr->sendrecv_mode.len; - } - - if (attr->ptime.len) { - clone_attr->ptime.s = p; - clone_attr->ptime.len = attr->ptime.len; - memcpy( p, attr->ptime.s, attr->ptime.len); - p += attr->ptime.len; - } - return clone_attr; } @@ -1001,6 +942,8 @@ sdp_stream_cell_t * clone_sdp_stream_cell(sdp_stream_cell_t *stream) stream->media.len + stream->port.len + stream->transport.len + + stream->sendrecv_mode.len + + stream->ptime.len + stream->payloads.len + stream->bw_type.len + stream->bw_width.len + @@ -1063,6 +1006,20 @@ sdp_stream_cell_t * clone_sdp_stream_cell(sdp_stream_cell_t *stream) p += stream->transport.len; } + if (stream->sendrecv_mode.len) { + clone_stream->sendrecv_mode.s = p; + clone_stream->sendrecv_mode.len = stream->sendrecv_mode.len; + memcpy( p, stream->sendrecv_mode.s, stream->sendrecv_mode.len); + p += stream->sendrecv_mode.len; + } + + if (stream->ptime.len) { + clone_stream->ptime.s = p; + clone_stream->ptime.len = stream->ptime.len; + memcpy( p, stream->ptime.s, stream->ptime.len); + p += stream->ptime.len; + } + if (stream->payloads.len) { clone_stream->payloads.s = p; clone_stream->payloads.len = stream->payloads.len; diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index 73c334f..0e9f19c 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -40,8 +40,6 @@ typedef struct sdp_payload_attr { str rtp_enc; str rtp_clock; str rtp_params; - str sendrecv_mode; - str ptime; } sdp_payload_attr_t; typedef struct sdp_stream_cell { @@ -54,6 +52,8 @@ typedef struct sdp_stream_cell { str media; str port; str transport; + str sendrecv_mode; + str ptime; str payloads; int payloads_num; /**< number of payloads inside a stream */ /* b=<bwtype>:<bandwidth> */

1 0

git:master: core: sdp parser - adding two new getters
by Ovidiu Sas 27 Jun '10

27 Jun '10

Module: sip-router Branch: master Commit: 5a1d36d4fc94df11c1ff148ccd873f2fb2e82859 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a1d36d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Jun 27 17:00:28 2010 -0400 core: sdp parser - adding two new getters - get_sdp_session_num: get the total number of sessions - get_sdp_stream_num: get the total number of streams --- parser/sdp/sdp.c | 19 ++++++++++++++++++- parser/sdp/sdp.h | 9 +++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 11aa8f1..0b6d3e9 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -260,6 +260,19 @@ void set_sdp_sendrecv_mode_attr(sdp_stream_cell_t *stream, sdp_payload_attr_t *p /* * Getters .... */ +int get_sdp_session_num(struct sip_msg* _m) +{ + if (_m->body == NULL) return 0; + if (_m->body->type != MSG_BODY_SDP) return 0; + return ((sdp_info_t*)_m->body)->sessions_num; +} + +int get_sdp_stream_num(struct sip_msg* _m) +{ + if (_m->body == NULL) return 0; + if (_m->body->type != MSG_BODY_SDP) return 0; + return ((sdp_info_t*)_m->body)->streams_num; +} sdp_session_cell_t* get_sdp_session_sdp(struct sdp_info* sdp, int session_num) { @@ -478,6 +491,9 @@ 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, pf, &sdp_ip); if (stream == 0) return -1; + /* increment total number of streams */ + _sdp->streams_num++; + /* b1p will point to per-media "b=" */ b1p = find_sdp_line(m1p, m2p, 'b'); if (b1p) { @@ -839,7 +855,7 @@ void print_sdp(sdp_info_t* sdp) { sdp_session_cell_t *session; - LM_DBG("sdp:%p=>%p (%d)\n", sdp, sdp->sessions, sdp->sessions_num); + LM_DBG("sdp:%p=>%p (%d:%d)\n", sdp, sdp->sessions, sdp->sessions_num, sdp->streams_num); session = sdp->sessions; while (session) { print_sdp_session(session); @@ -1207,6 +1223,7 @@ sdp_info_t * clone_sdp_info(struct sip_msg* _m) memset( clone_sdp_info, 0, len); LM_DBG("we have %d sessions\n", sdp_info->sessions_num); clone_sdp_info->sessions_num = sdp_info->sessions_num; + clone_sdp_info->streams_num = sdp_info->streams_num; session=sdp_info->sessions; clone_session=clone_sdp_session_cell(session); diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index c26a568..73c334f 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -98,6 +98,7 @@ typedef struct sdp_info { msg_body_type_t type; free_msg_body_f free; int sessions_num; /**< number of SDP sessions */ + int streams_num; /**< total number of streams for all SDP sessions */ struct sdp_session_cell *sessions; } sdp_info_t; @@ -108,6 +109,14 @@ typedef struct sdp_info { int parse_sdp(struct sip_msg* _m); /** + * Get number of sessions in existing SDP. + */ +int get_sdp_session_num(struct sip_msg* _m); +/** + * Get number of streams in existing SDP. + */ +int get_sdp_stream_num(struct sip_msg* _m); +/** * Get a session for the current sip msg based on position inside SDP. */ sdp_session_cell_t* get_sdp_session(struct sip_msg* _m, int session_num);

1 0

git:master: modules_k:dialog: new dialog callback: DLGCB_RPC_CONTEXT
by Ovidiu Sas 27 Jun '10

27 Jun '10

Module: sip-router Branch: master Commit: ea6356bcbd80470d2183c6626eedaf7535dc3a2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea6356b… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Jun 27 14:22:10 2010 -0400 modules_k:dialog: new dialog callback: DLGCB_RPC_CONTEXT - implementing a new dialog callback for rpc qos context interogation --- modules_k/dialog/dialog.c | 17 +++++++++++++++++ modules_k/dialog/dlg_cb.h | 3 ++- modules_k/qos/qos_handlers.c | 22 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index cc33f39..f00021e 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -1146,6 +1146,9 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, struct dlg_cell * rpc->printf(c, "\tcaller_bind_addr:%.*s callee_bind_addr:", 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); + } } /*! @@ -1294,9 +1297,15 @@ static void internal_rpc_profile_print_dlgs(rpc_t *rpc, void *c, str *profile_na static const char *rpc_print_dlgs_doc[2] = { "Print all dialogs", 0 }; +static const char *rpc_print_dlgs_ctx_doc[2] = { + "Print all dialogs with associated context", 0 +}; static const char *rpc_print_dlg_doc[2] = { "Print dialog based on callid and fromtag", 0 }; +static const char *rpc_print_dlg_ctx_doc[2] = { + "Print dialog with associated context based on callid and fromtag", 0 +}; static const char *rpc_end_dlg_entry_id_doc[2] = { "End a given dialog based on [h_entry] [h_id]", 0 }; @@ -1315,9 +1324,15 @@ static const char *rpc_dlg_bridge_doc[2] = { static void rpc_print_dlgs(rpc_t *rpc, void *c) { internal_rpc_print_dlgs(rpc, c, 0); } +static void rpc_print_dlgs_ctx(rpc_t *rpc, void *c) { + internal_rpc_print_dlgs(rpc, c, 1); +} static void rpc_print_dlg(rpc_t *rpc, void *c) { internal_rpc_print_single_dlg(rpc, c, 0); } +static void rpc_print_dlg_ctx(rpc_t *rpc, void *c) { + internal_rpc_print_single_dlg(rpc, c, 1); +} static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { unsigned int h_entry, h_id; struct dlg_cell * dlg = NULL; @@ -1367,7 +1382,9 @@ static void rpc_dlg_bridge(rpc_t *rpc, void *c) { static rpc_export_t rpc_methods[] = { {"dlg.list", rpc_print_dlgs, rpc_print_dlgs_doc, 0}, + {"dlg.list_ctx", rpc_print_dlgs_ctx, rpc_print_dlgs_ctx_doc, 0}, {"dlg.dlg_list", rpc_print_dlg, rpc_print_dlg_doc, 0}, + {"dlg.dlg_list_ctx", rpc_print_dlg_ctx, rpc_print_dlg_ctx_doc, 0}, {"dlg.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0}, {"dlg.profile_get_size", rpc_profile_get_size, rpc_profile_get_size_doc, 0}, {"dlg.profile_list", rpc_profile_print_dlgs, rpc_profile_print_dlgs_doc, 0}, diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h index 3f22b33..3013809 100644 --- a/modules_k/dialog/dlg_cb.h +++ b/modules_k/dialog/dlg_cb.h @@ -64,7 +64,8 @@ typedef int (*register_dlgcb_f)(struct dlg_cell* dlg, int cb_types, #define DLGCB_RESPONSE_FWDED (1<<8) #define DLGCB_RESPONSE_WITHIN (1<<9) #define DLGCB_MI_CONTEXT (1<<10) -#define DLGCB_DESTROY (1<<11) +#define DLGCB_RPC_CONTEXT (1<<11) +#define DLGCB_DESTROY (1<<12) struct dlg_callback { int types; diff --git a/modules_k/qos/qos_handlers.c b/modules_k/qos/qos_handlers.c index 9858df0..85416ba 100644 --- a/modules_k/qos/qos_handlers.c +++ b/modules_k/qos/qos_handlers.c @@ -58,6 +58,7 @@ static void qos_dialog_destroy_CB(struct dlg_cell* did, int type, struct dlg_cb_ static void qos_dialog_request_CB(struct dlg_cell* did, int type, struct dlg_cb_params * params); static void qos_dialog_response_CB(struct dlg_cell* did, int type,struct dlg_cb_params * params); +static void qos_dialog_rpc_context_CB(struct dlg_cell* did, int type,struct dlg_cb_params * params); /** * The value of the message flag to flag an INVITE we want to process @@ -90,6 +91,8 @@ static void setup_dialog_callbacks(struct dlg_cell *did, qos_ctx_t *ctx) dlg_binds->register_dlgcb(did, DLGCB_MI_CONTEXT, qos_dialog_mi_context_CB, (void *)ctx, NULL); + dlg_binds->register_dlgcb(did, DLGCB_RPC_CONTEXT, + qos_dialog_rpc_context_CB, (void *)ctx, NULL); return; } @@ -279,3 +282,22 @@ static void qos_dialog_response_CB(struct dlg_cell* did, int type, struct dlg_cb return; } +/********************************* RPC *********************************/ +void qos_dialog_rpc_context_CB(struct dlg_cell* did, int type, struct dlg_cb_params * params) +{ + 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 */ + } + + qos_sdp = qos_ctx->negotiated_sdp; + if (qos_sdp) { + /* print negotiated sdp context */ + } + + return; +} +

1 0

how to evaluate a string value?
by Juha Heinanen 27 Jun '10

27 Jun '10

i tried to implement eval function that evaluates a string given as first param and writes the result to second param (see below). the idea is to first get the string argument, then run spve fixup on it and, finally, get and store the result. unfortunately nothing sensible comes out and even orig and type of the spve fixup result are bogus. the fist INFO output shows that the string value to be evaluated is got correctly. also all function calls succeed. obviously the above logic or its realization has something wrong in it. does someone have any ideas where the problems are? -- juha /* * Evaluates first param (string) and saves result to second param (pvar) */ int eval(struct sip_msg* _m, char* _string, char* _dst) { str value, result; char **param; pv_spec_t *dst; pv_value_t val; fparam_t *fp; if (fixup_get_svalue(_m, (gparam_p)_string, &value) != 0) { LM_ERR("cannot get parameter value\n"); return -1; } param = &(value.s); LM_INFO("param value as string is <%s>\n", *param); if (fixup_spve_null((void **)param, 1) != 0) { LM_ERR("failed to evaluate parameter <%.*s>\n", value.len, value.s); return -1; } fp = (fparam_t *)param; LM_INFO("orig <%s>, type <%d>\n", fp->orig, fp->type); if (get_str_fparam(&result, _m, fp) != 0) { LM_ERR("cannot get result value\n"); return -1; } val.rs.s = result.s; val.rs.len = result.len; LM_INFO("eval result: %.*s\n", val.rs.len, val.rs.s); val.flags = PV_VAL_STR; dst = (pv_spec_t *)_dst; dst->setf(_m, &dst->pvp, (int)EQ_T, &val); return 1; }

1 0

SF.net SVN: openser:[6011] branches/1.5/modules/lcr
by Juha Heinanen 27 Jun '10

27 Jun '10

Revision: 6011 http://openser.svn.sourceforge.net/openser/?rev=6011&view=rev Author: juhe Date: 2010-06-27 05:18:41 +0000 (Sun, 27 Jun 2010) Log Message: ----------- * modules/lcr: fixed to_gw/to_gw_grp documentation Modified Paths: -------------- branches/1.5/modules/lcr/README branches/1.5/modules/lcr/doc/lcr_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

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