sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

git:janakj/kcore: Added privacy header parser from kamailio to kcore lib
by Jan Janak 27 Mar '09

27 Mar '09

Module: sip-router Branch: janakj/kcore Commit: c1fe1a0f52caa32f099917a24815d12d199e86d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1fe1a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 08:25:33 2009 +0100 Added privacy header parser from kamailio to kcore lib Signed-off-by: Jan Janak <jan(a)iptel.org> --- lib/kcore/parse_privacy.c | 226 ++++++++++++++++++++++++++++++++++… [View More]+++++++++++ lib/kcore/parse_privacy.h | 74 +++++++++++++++ 2 files changed, 300 insertions(+), 0 deletions(-) diff --git a/lib/kcore/parse_privacy.c b/lib/kcore/parse_privacy.c new file mode 100644 index 0000000..6b5e78f --- /dev/null +++ b/lib/kcore/parse_privacy.c @@ -0,0 +1,226 @@ +/* + * $Id: parse_privacy.c 4720 2008-08-23 10:56:15Z henningw $ + * + * Copyright (c) 2006 Juha Heinanen + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * History: + * ------- + * 2006-12-18 Introduced parsing of Privacy header (RFC 3323) + */ + +/*! + * \file + * \brief Privacy value parser + * \ingroup parser + */ + +#include <stdlib.h> +#include <string.h> +#include "../../dprint.h" +#include "../../trim.h" +#include "parse_privacy.h" +#include "../../parser/msg_parser.h" + + +/*! + * Parse a privacy value pointed by start that can be at most max_len long. + * \return length of matched privacy value on success or NULL otherwise + */ +unsigned int parse_priv_value(char* start, unsigned int max_len, + unsigned int* value) +{ + unsigned int len; + + if (!start || !value) { + LM_ERR("invalid parameter value\n"); + return 0; + } + + switch (start[0]) { + + case 'c': + case 'C': + if(max_len < 8) + return 0; + if (strncasecmp(start, "critical", 8) == 0) { + *value = PRIVACY_CRITICAL; + len = 8; + break; + } else { + return 0; + } + + case 'h': + case 'H': + if (max_len < 6) + return 0; + if (strncasecmp(start, "header", 6) == 0) { + *value = PRIVACY_HEADER; + len = 6; + break; + } + if (max_len < 7) + return 0; + if (strncasecmp(start, "history", 7) == 0) { + *value = PRIVACY_HISTORY; + len = 7; + break; + } else { + return 0; + } + + case 'i': + case 'I': + if(max_len < 2) + return 0; + if (start[1] == 'd' || start[1] == 'D') { + *value = PRIVACY_ID; + len = 2; + break; + } else { + return 0; + } + + case 'n': + case 'N': + if(max_len < 4) + return 0; + if (strncasecmp(start, "none", 4) == 0) { + *value = PRIVACY_NONE; + len = 4; + break; + } else { + return 0; + } + + case 's': + case 'S': + if(max_len < 7) + return 0; + if (strncasecmp(start, "session", 7) == 0) { + *value = PRIVACY_SESSION; + len = 7; + break; + } else { + return 0; + } + + case 'u': + case 'U': + if(max_len < 4) + return 0; + if (strncasecmp(start, "user", 4) == 0) { + *value = PRIVACY_USER; + len = 4; + break; + } else { + return 0; + } + + default: + return 0; + } + + if(len < max_len) { + if(start[len] != '\0' && start[len] != ';' && start[len] != ' ' + && start[len] != '\t' && start[len] != '\r' && start[len] != '\n') + return 0; + } + + return len; +} + + +/*! + * This method is used to parse Privacy HF body, which consist of + * comma separated list of priv-values. After parsing, msg->privacy->parsed + * contains enum bits of privacy values defined in parse_privacy.h. + * \return 0 on success and -1 on failure. + */ +int parse_privacy(struct sip_msg *msg) +{ + unsigned int val_len, value, values, len; + str next; + char *p, *beyond; + + /* maybe the header is already parsed! */ + if (msg->privacy && msg->privacy->parsed) + return 0; + + /* parse Privacy HF (there should be only one) */ + if (!msg->privacy && + (parse_headers(msg, HDR_PRIVACY_F, 0) == -1 || !msg->privacy)) { + return -1; + } + + next.len = msg->privacy->body.len; + next.s = msg->privacy->body.s; + + trim_leading(&next); + + if (next.len == 0) { + LM_ERR("no values\n"); + return -1; + } + + values = 0; + p = next.s; + len = next.len; + beyond = p + len; + + while (p < beyond) { + if((val_len = parse_priv_value(p, len, &value)) != 0) { + values |= value; + p = p + val_len; + len = len - val_len; + } else { + LM_ERR("invalid privacy value\n"); + return -1; + } + + while(p < beyond && (*p == ' ' || *p == '\t' + || *p == '\r' || *p == '\n')) + p++; + + if(p >= beyond) break; + + if (*p == ';') { + p++; + while(p < beyond && (*p == ' ' || *p == '\t' + || *p == '\r' || *p == '\n')) + p++; + if(p >= beyond) { + LM_ERR("no privacy value after comma\n"); + return -1; + } + } else { + LM_ERR("semicolon expected\n"); + return -1; + } + } + + if ((values & PRIVACY_NONE) && (values ^ PRIVACY_NONE)) { + LM_ERR("no other privacy values allowed with 'none'\n"); + return -1; + } + + msg->privacy->parsed = (void *)(long)values; + + return 0; +} diff --git a/lib/kcore/parse_privacy.h b/lib/kcore/parse_privacy.h new file mode 100644 index 0000000..41a46ad --- /dev/null +++ b/lib/kcore/parse_privacy.h @@ -0,0 +1,74 @@ +/* + * $Id: parse_privacy.h 4720 2008-08-23 10:56:15Z henningw $ + * + * Copyright (c) 2006 Juha Heinanen + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Privacy value parser + * \ingroup parser + */ + +#ifndef PARSE_PRIVACY_H +#define PARSE_PRIVACY_H + +#include "../../mem/mem.h" +#include "../../parser/msg_parser.h" + + +/*! bitmap of Privacy header privacy values + * (http://www.iana.org/assignments/sip-priv-values) + */ +enum privacy_value { + PRIVACY_USER=1, + PRIVACY_HEADER=2, + PRIVACY_SESSION=4, + PRIVACY_NONE=8, + PRIVACY_CRITICAL=16, + PRIVACY_ID=32, + PRIVACY_HISTORY=64 +}; + + +/*! + * casting macro for accessing enumeration of priv-values + */ +#define get_privacy_values(p_msg) \ + ((unsigned int)(long)((p_msg)->privacy->parsed)) + + +/*! + * This method is used to parse Privacy HF body, which consist of + * comma separated list of priv-values. After parsing, msg->privacy->parsed + * contains enum bits of privacy values defined in parse_privacy.h. + * \return 0 on success and -1 on failure. + */ +int parse_privacy(struct sip_msg *msg); + + +/*! + * Parse a privacy value pointed by start that can be at most max_len long. + * \return length of matched privacy value on success or NULL otherwise + */ +unsigned int parse_priv_value(char* start, unsigned int max_len, + unsigned int* value); + + +#endif /* PARSE_PRIVACY_H */ [View Less]

1 0

git:master: Kamailio compatibility: Privacy header field name parser
by Jan Janak 27 Mar '09

27 Mar '09

Module: sip-router Branch: master Commit: 87d849786768991e8b1287f14567ce409b27d0c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87d8497… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 08:59:37 2009 +0100 Kamailio compatibility: Privacy header field name parser This patch adds support for the Privacy header field name parser. --- parser/case_priv.h | 51 ++++++++++++++++++++++++++++++++++++++++++++… [View More]+++++ parser/hf.c | 1 + parser/hf.h | 2 + parser/keys.h | 4 +++ parser/msg_parser.c | 5 ++++ parser/msg_parser.h | 1 + parser/parse_hname2.c | 5 ++- 7 files changed, 67 insertions(+), 2 deletions(-) diff --git a/parser/case_priv.h b/parser/case_priv.h new file mode 100644 index 0000000..a8f68e0 --- /dev/null +++ b/parser/case_priv.h @@ -0,0 +1,51 @@ +/* + * $Id$ + * + * Call-ID Header Name Parsing Macros + * + * Copyright (C) 2001-2003 FhG FOKUS + * + * This file is part of ser, a free SIP server. + * + * ser is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * ser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _CASE_PRIV_H +#define _CASE_PRIV_H + + +#define ACY_CASE \ + switch(LOWER_DWORD(val)) { \ + case _acy1_: \ + hdr->type = HDR_PRIVACY_T; \ + hdr->name.len = 7; \ + return (p + 4); \ + \ + case _acy2_: \ + hdr->type = HDR_PRIVACY_T; \ + p += 4; \ + goto dc_end; \ + } + + +#define priv_CASE \ + p += 4; \ + val = READ(p); \ + ACY_CASE; \ + goto other; + + + +#endif /* _CASE_PRIV_H */ diff --git a/parser/hf.c b/parser/hf.c index f33aaa1..a54865e 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -214,6 +214,7 @@ void clean_hdr_field(struct hdr_field* hf) case HDR_WWW_AUTHENTICATE_T: case HDR_PROXY_AUTHENTICATE_T: case HDR_PATH_T: + case HDR_PRIVACY_T: break; default: LOG(L_CRIT, "BUG: clean_hdr_field: unknown header type %d\n", diff --git a/parser/hf.h b/parser/hf.h index bddf0a2..93b0648 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -110,6 +110,7 @@ enum _hdr_types_t { HDR_PPI_T /**< P-Preferred-Identity header field */, HDR_PAI_T /**< P-Asserted-Identity header field */, HDR_PATH_T /**< Path header field */, + HDR_PRIVACY_T /**< Privacy header field */, HDR_EOH_T /* End of message header */ }; @@ -180,6 +181,7 @@ typedef unsigned long long hdr_flags_t; #define HDR_PPI_F HDR_F_DEF(PPI) #define HDR_PAI_F HDR_F_DEF(PAI) #define HDR_PATH_F HDR_F_DEF(PATH) +#define HDR_PRIVACY_F HDR_F_DEF(PRIVACY) #define HDR_OTHER_F HDR_F_DEF(OTHER) diff --git a/parser/keys.h b/parser/keys.h index bf17058..bd53863 100644 --- a/parser/keys.h +++ b/parser/keys.h @@ -181,4 +181,8 @@ #define _ter1_ 0x3a726574 /* "ter:" */ #define _ter2_ 0x20726574 /* "ter " */ +#define _priv_ 0x76697270 /* "priv" */ +#define _acy2_ 0x20796361 /* "acy " */ +#define _acy1_ 0x3a796361 /* "acy:" */ + #endif /* KEYS_H */ diff --git a/parser/msg_parser.c b/parser/msg_parser.c index bc73fb7..23201c5 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -242,6 +242,7 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr) case HDR_WWW_AUTHENTICATE_T: case HDR_PROXY_AUTHENTICATE_T: case HDR_PATH_T: + case HDR_PRIVACY_T: case HDR_OTHER_T: /* just skip over it */ hdr->body.s=tmp; @@ -521,6 +522,10 @@ int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next) if (msg->path==0) msg->path=hf; msg->parsed_flag|=HDR_PATH_F; break; + case HDR_PRIVACY_T: + if (msg->privacy==0) msg->privacy=hf; + msg->parsed_flag|=HDR_PRIVACY_F; + break; default: LOG(L_CRIT, "BUG: parse_headers: unknown header type %d\n", hf->type); diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 74754f7..1b250df 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -278,6 +278,7 @@ typedef struct sip_msg { struct hdr_field* pai; struct hdr_field* ppi; struct hdr_field* path; + struct hdr_field* privacy; struct msg_body* body; diff --git a/parser/parse_hname2.c b/parser/parse_hname2.c index a222d5e..2b4152a 100644 --- a/parser/parse_hname2.c +++ b/parser/parse_hname2.c @@ -99,6 +99,7 @@ static inline char* skip_ws(char* p, unsigned int size) #include "case_iden.h" /* Identity, Identity-info */ #include "case_retr.h" /* Retry-After */ #include "case_path.h" /* Path */ +#include "case_priv.h" #define READ(val) \ @@ -144,8 +145,8 @@ static inline char* skip_ws(char* p, unsigned int size) case _date_: date_CASE; \ case _iden_: iden_CASE; \ case _retr_: retr_CASE; \ - case _path_: path_CASE; - + case _path_: path_CASE; \ + case _priv_: priv_CASE; #define PARSE_COMPACT(id) \ [View Less]

1 0

git:master: Kamailio compatibility: Privacy header field name parser
by Jan Janak 27 Mar '09

27 Mar '09

Module: sip-router Branch: master Commit: f4e8001524226fed4dc34e8d72aa72aef3c9f237 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4e8001… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 09:03:47 2009 +0100 Kamailio compatibility: Privacy header field name parser This patch extendes the tm module with support for the Privacy header field which are now parsed by the core, this patch teaches tm how to ignore … [View More]

1 0

New commits on branch master
by Jan Janak 26 Mar '09

26 Mar '09

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29b0138… Author: Jan Janak <jan(a)iptel.org> Date: Thu Mar 26 14:49:36 2009 +0100 Replace TCP_BUF_SIZE with a cfg_get(..). URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6eed41… Author: Jan Janak <jan(a)iptel.org> Date: Thu Mar 26 14:45:40 2009 +0100 Remove shm_str_dup function. This function is not being used anywhere in TLS module and conflicts … [View More]

1 1

PATCH: sdp parser
by Ovidiu Sas 24 Mar '09

24 Mar '09

Here's a patch for porting the sdp parser from k core into the sr core. First, the parser/sdp directory must be imported from k core into the sr core and after that the attached patch should be applied. After this, the qos module should compile. Regards, Ovidiu Sas

2 2

git:master: Update the SDP parser for the sip-router core.
by Jan Janak 24 Mar '09

24 Mar '09

Module: sip-router Branch: master Commit: d6ac6a12e171fe5cff766ef187a0a0be945de758 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6ac6a1… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 24 20:36:57 2009 +0100 Update the SDP parser for the sip-router core. This patch makes the SDP parser work with the sip-router core. The sr core sip_msg structure does not contain the pointer to sdp_info_t, instead it … [View More]contains an element called body which points to a generic structure msg_body_t. To make the SDP parser work with the sr core we need to cast msg_body_t to sdp_info_t and add 'type' and 'free' elements at the beginning of the sdp_info structure. Function new_sdp then stores the type of the document being parsed in msg->body->type and a pointer to free_sdp function in msg->body->free. Furthemore, testing just if (msg->body != 0) is not enough anymore, because the variable could also contain a pointer to a different body document type. So we need to change all such tests to something like: if ((msg->body != 0) && (msg->body->type == MSG_BODY_SDP)) --- parser/sdp/sdp.c | 38 ++++++++++++++++++++++++-------------- parser/sdp/sdp.h | 2 ++ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index ec43cf3..4a6697f 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -51,8 +51,9 @@ static inline int new_sdp(struct sip_msg* _m) return -1; } memset( sdp, 0, sizeof(sdp_info_t)); - - _m->sdp = sdp; + sdp->type = MSG_BODY_SDP; + sdp->free = (free_msg_body_f)free_sdp; + _m->body = (msg_body_t*)sdp; return 0; } @@ -279,8 +280,9 @@ sdp_session_cell_t* get_sdp_session_sdp(struct sdp_info* sdp, int session_num) sdp_session_cell_t* get_sdp_session(struct sip_msg* _m, int session_num) { - if (_m->sdp == NULL) return NULL; - return get_sdp_session_sdp(_m->sdp, session_num); + if (_m->body == NULL) return NULL; + if (_m->body->type != MSG_BODY_SDP) return NULL; + return get_sdp_session_sdp((sdp_info_t*)_m->body, session_num); } @@ -311,15 +313,18 @@ sdp_stream_cell_t* get_sdp_stream_sdp(struct sdp_info* sdp, int session_num, int sdp_stream_cell_t* get_sdp_stream(struct sip_msg* _m, int session_num, int stream_num) { + sdp_info_t* sdp; sdp_session_cell_t *session; sdp_stream_cell_t *stream; - return get_sdp_stream_sdp(_m->sdp, session_num, stream_num); + return get_sdp_stream_sdp((sdp_info_t*)_m->body, session_num, stream_num); - if (_m->sdp == NULL) return NULL; - if (session_num > _m->sdp->sessions_num) return NULL; + sdp = (sdp_info_t*)_m->body; + if (sdp == NULL) return NULL; + if (sdp->type != MSG_BODY_SDP) return NULL; + if (session_num > sdp->sessions_num) return NULL; - session = _m->sdp->sessions; + session = sdp->sessions; while (session) { if (session->session_num == session_num) { stream = session->streams; @@ -666,7 +671,7 @@ int parse_sdp(struct sip_msg* _m) str body, mp_delimiter; int mime; - if (_m->sdp) { + if (_m->body) { return 0; /* Already parsed */ } @@ -696,10 +701,10 @@ int parse_sdp(struct sip_msg* _m) LM_ERR("Can't create sdp\n"); return -1; } - res = parse_sdp_session(&body, 0, NULL, _m->sdp); + res = parse_sdp_session(&body, 0, NULL, (sdp_info_t*)_m->body); if (res != 0) { LM_DBG("free_sdp\n"); - free_sdp((sdp_info_t**)(void*)&(_m->sdp)); + free_sdp((sdp_info_t**)&_m->body); } return res; break; @@ -719,9 +724,9 @@ int parse_sdp(struct sip_msg* _m) LM_ERR("Can't create sdp\n"); return -1; } - res = parse_mixed_content(&body, mp_delimiter, _m->sdp); + res = parse_mixed_content(&body, mp_delimiter, (sdp_info_t*)_m->body); if (res != 0) { - free_sdp((sdp_info_t**)(void*)&(_m->sdp)); + free_sdp((sdp_info_t**)&_m->body); } return res; } else { @@ -1151,7 +1156,8 @@ error: sdp_info_t * clone_sdp_info(struct sip_msg* _m) { - sdp_info_t *clone_sdp_info, *sdp_info=_m->sdp; + sdp_info_t *clone_sdp_info, *sdp_info=(sdp_info_t*)_m->body +; sdp_session_cell_t *clone_session, *prev_clone_session, *session; int i, len; @@ -1159,6 +1165,10 @@ sdp_info_t * clone_sdp_info(struct sip_msg* _m) LM_ERR("no sdp to clone\n"); return NULL; } + if (sdp_info->type != MSG_BODY_SDP) { + LM_ERR("Unsupported body type\n"); + return NULL; + } if (sdp_info->sessions_num == 0) { LM_ERR("no sessions to clone\n"); return NULL; diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index 3f6c775..9c9b9c7 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -86,6 +86,8 @@ typedef struct sdp_session_cell { * Here we hold the head of the parsed sdp structure */ typedef struct sdp_info { + msg_body_type_t type; + free_msg_body_f free; int sessions_num; /**< number of SDP sessions */ struct sdp_session_cell *sessions; } sdp_info_t; [View Less]

1 0

git:master: New element of sip_msg structure with pointer to parsed body
by Jan Janak 24 Mar '09

24 Mar '09

Module: sip-router Branch: master Commit: 5a8977107c9c3f49dedf6de748cef421d755aa8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a89771… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 24 20:30:31 2009 +0100 New element of sip_msg structure with pointer to parsed body This patch adds a new variable (called body) to the sip_msg structure which can be used to store a pointer to parsed message body. This is … [View More]useful for modules that need to parse the SIP message body and would like to store the result somewhere in the sip_msg structure so that the body does not get parsed repeatedly. The pointer is of type msg_body which is a generic structure that represents parsed body of any type (SDP documents, XML documents, etc.). This structure contains only two elements, the first element is enum msg_body_type which designates the type of the parsed body document. The second element is a pointer to a free function that is called by the sr core to free all memory associated with the parsed body structure. Body parsers do not use the generic structure directly, instead they are supposed to cast it to some other data structure. The target structure must, however, retain the first two elements (the type and the free function pointer) in the same order as the generic structure. Body parsers provide the value of 'type' and 'free' elements. The new structure in this commit only supports one body document type per SIP message. As a possible future extension we could modify the structure so that multiple such structures can be arranged into a tree-like structure and then we will have support for multi-part body documents. --- parser/msg_parser.c | 1 + parser/msg_parser.h | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 74f91f5..bc73fb7 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -694,6 +694,7 @@ void free_sip_msg(struct sip_msg* msg) if (msg->new_uri.s) { pkg_free(msg->new_uri.s); msg->new_uri.len=0; } if (msg->dst_uri.s) { pkg_free(msg->dst_uri.s); msg->dst_uri.len=0; } if (msg->headers) free_hdr_field_lst(msg->headers); + if (msg->body && msg->body->free) msg->body->free(&msg->body); if (msg->add_rm) free_lump_list(msg->add_rm); if (msg->body_lumps) free_lump_list(msg->body_lumps); if (msg->reply_lump) free_reply_lump(msg->reply_lump); diff --git a/parser/msg_parser.h b/parser/msg_parser.h index af85f21..74754f7 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -200,6 +200,26 @@ struct sip_uri { #endif }; +struct msg_body; + +typedef void (*free_msg_body_f)(struct msg_body** ptr); + +typedef enum msg_body_type { + MSG_BODY_UNKNOWN = 0, + MSG_BODY_SDP +} msg_body_type_t; + +/* This structure represents a generic SIP message body, regardless of the + * body type. Body parsers are supposed to cast this structure to some other + * body-type specific structure, but the body type specific structure must + * retain msg_body_type variable and a pointer to the free function as the + * first two variables within the structure. + */ +typedef struct msg_body { + msg_body_type_t type; + free_msg_body_f free; +} msg_body_t; + typedef struct sip_msg { unsigned int id; /* message id, unique/process*/ @@ -259,6 +279,8 @@ typedef struct sip_msg { struct hdr_field* ppi; struct hdr_field* path; + struct msg_body* body; + char* eoh; /* pointer to the end of header (if found) or null */ char* unparsed; /* here we stopped parsing*/ [View Less]

1 0

git:master: SDP document parser
by Jan Janak 24 Mar '09

24 Mar '09

Module: sip-router Branch: master Commit: 450962d0565f6bfaafc7bc47083d98127f23fcff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=450962d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 24 18:48:32 2009 +0100 SDP document parser Signed-off-by: Jan Janak <jan(a)iptel.org> --- parser/sdp/sdp.c | 1201 ++++++++++++++++++++++++++++++++++++++++++ parser/sdp/sdp.h | 155 ++… [View More]

1 0

git:master: Do not clone sip_msg->body into shared memory
by Jan Janak 24 Mar '09

24 Mar '09

Module: sip-router Branch: master Commit: fc9cfc98af91092de9e12533c255778080b045dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc9cfc9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 24 20:48:44 2009 +0100 Do not clone sip_msg->body into shared memory --- modules/tm/sip_msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index … [View More]

1 0

git:master: Compile also the files in parser/sdp
by Jan Janak 24 Mar '09

24 Mar '09

Module: sip-router Branch: master Commit: 87ee53fb39fa1865a161b2efaedb48819f283dc9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87ee53f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 24 20:04:18 2009 +0100 Compile also the files in parser/sdp --- Makefile.sources | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.sources b/Makefile.sources index d98c4a2..7178f58 100644 --- … [View More]

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2009