sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

git:master: Kamailio compatiblity: function to set/get all branch flags
by Jan Janak 16 Mar '09

16 Mar '09

Module: sip-router Branch: master Commit: 5a68f95d1068617c2cbd324b56a0f5632db1a70c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a68f95… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 16 14:46:51 2009 +0100 Kamailio compatiblity: function to set/get all branch flags --- dset.c | 19 +++++++++++++++++++ dset.h | 22 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dset.c b/dset.c index 8c0a555..cbc636b 100644 --- a/dset.c +++ b/dset.c @@ -126,6 +126,25 @@ int resetbflag(unsigned int branch, flag_t flag) } +int getbflags(flag_t* res, unsigned int branch) +{ + flag_t* flags; + if (res == NULL) return -1; + if ((flags = get_bflags_ptr(branch)) == NULL) return -1; + *res = *flags; + return 1; +} + + +int setbflagsval(unsigned int branch, flag_t val) +{ + flag_t* flags; + if ((flags = get_bflags_ptr(branch)) == NULL) return -1; + *flags = val; + return 1; +} + + /* * Initialize the branch iterator, the next * call to next_branch will return the first diff --git a/dset.h b/dset.h index 36ffaff..e350238 100644 --- a/dset.h +++ b/dset.h @@ -121,4 +121,26 @@ int resetbflag(unsigned int branch, flag_t flag); */ int isbflagset(unsigned int branch, flag_t flag); +/** + * Get the value of all branch flags for a branch + * + * This function returns the value of all branch flags + * combined in a single variable. + * @param res A pointer to a variable to store the result + * @param branch Number of the branch (0 for the main Request-URI branch) + * @return 1 on success, -1 on failure + */ +int getbflags(flag_t* res, unsigned int branch); + +/** + * Set the value of all branch flags at once for a given branch. + * + * This function sets the value of all branch flags for a given + * branch at once. + * @param branch Number of the branch (0 for the main Request-URI branch) + * @param val All branch flags combined into a single variable + * @return 1 on success, -1 on failure + */ +int setbflagsval(unsigned int branch, flag_t val); + #endif /* _DSET_H */

1 0

git:master: Kamailio compatibility: dset manipulation functions
by Jan Janak 16 Mar '09

16 Mar '09

Module: sip-router Branch: master Commit: 52d5764edb18455193e0c054108b8e928c25fd55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52d5764… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 16 00:48:06 2009 +0100 Kamailio compatibility: dset manipulation functions This patch adds two extra kamailio compatibility functions: * get_branch which allows the caller to obtain the parameters of a branch using its index * km_append_branch which is similar to append_branch in sip-router except that the parameters of the function are slightly different. --- dset.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ dset.h | 8 ++++ 2 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dset.c b/dset.c index a3a6fff..8c0a555 100644 --- a/dset.c +++ b/dset.c @@ -174,6 +174,46 @@ char* next_branch(int* len, qvalue_t* q, char** dst_uri, int* dst_len, struct so } +/** \brief Get a branch from the destination set + * \return Return the 'i' branch from the dset + * array, 0 is returned if there are no + * more branches + */ +char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, + str* path, unsigned int *flags, struct socket_info** force_socket) +{ + if (i < nr_branches) { + *len = branches[i].len; + *q = branches[i].q; + if (dst_uri) { + dst_uri->len = branches[i].dst_uri_len; + dst_uri->s = (dst_uri->len)?branches[i].dst_uri:0; + } + if (path) { + path->len = branches[i].path_len; + path->s = (path->len)?branches[i].path:0; + } + if (force_socket) + *force_socket = branches[i].force_send_socket; + if (flags) + *flags = branches[i].flags; + return branches[i].uri; + } else { + *len = 0; + *q = Q_UNSPECIFIED; + if (dst_uri) { + dst_uri->s = 0; + dst_uri->len = 0; + } + if (force_socket) + *force_socket = 0; + if (flags) + *flags = 0; + return 0; + } +} + + /* * Empty the dset array */ @@ -244,6 +284,87 @@ int append_branch(struct sip_msg* msg, char* uri, int uri_len, char* dst_uri, in } +/* ! \brief + * Add a new branch to current transaction using str parameters + * Kamailio compatibility version + */ +int km_append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, + qvalue_t q, unsigned int flags, struct socket_info* force_socket) +{ + str luri; + +#ifdef USE_LOCAL_ROUTE + if (dset_state==0) + return -1; +#endif + + /* if we have already set up the maximum number + * of branches, don't try new ones + */ + if (nr_branches == MAX_BRANCHES - 1) { + LOG(L_ERR, "max nr of branches exceeded\n"); + ser_error = E_TOO_MANY_BRANCHES; + return -1; + } + + /* if not parameterized, take current uri */ + if (uri==0 || uri->len==0 || uri->s==0) { + if (msg->new_uri.s) + luri = msg->new_uri; + else + luri = msg->first_line.u.request.uri; + } else { + luri = *uri; + } + + if (luri.len > MAX_URI_SIZE - 1) { + LOG(L_ERR, "too long uri: %.*s\n", luri.len, luri.s); + return -1; + } + + /* copy the dst_uri */ + if (dst_uri && dst_uri->len && dst_uri->s) { + if (dst_uri->len > MAX_URI_SIZE - 1) { + LOG(L_ERR, "too long dst_uri: %.*s\n", + dst_uri->len, dst_uri->s); + return -1; + } + memcpy(branches[nr_branches].dst_uri, dst_uri->s, dst_uri->len); + branches[nr_branches].dst_uri[dst_uri->len] = 0; + branches[nr_branches].dst_uri_len = dst_uri->len; + } else { + branches[nr_branches].dst_uri[0] = '\0'; + branches[nr_branches].dst_uri_len = 0; + } + + /* copy the path string */ + if (path && path->len && path->s) { + if (path->len > MAX_PATH_SIZE - 1) { + LOG(L_ERR, "too long path: %.*s\n", path->len, path->s); + return -1; + } + memcpy(branches[nr_branches].path, path->s, path->len); + branches[nr_branches].path[path->len] = 0; + branches[nr_branches].path_len = path->len; + } else { + branches[nr_branches].path[0] = '\0'; + branches[nr_branches].path_len = 0; + } + + /* copy the ruri */ + memcpy(branches[nr_branches].uri, luri.s, luri.len); + branches[nr_branches].uri[luri.len] = 0; + branches[nr_branches].len = luri.len; + branches[nr_branches].q = q; + + branches[nr_branches].force_send_socket = force_socket; + branches[nr_branches].flags = flags; + + nr_branches++; + return 1; +} + + /* * Create a Contact header field from the dset * array diff --git a/dset.h b/dset.h index a4b4f7c..36ffaff 100644 --- a/dset.h +++ b/dset.h @@ -44,6 +44,10 @@ int append_branch(struct sip_msg* msg, char* uri, int uri_len, char* dst_uri, in qvalue_t q, struct socket_info* force_socket); +int km_append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, + qvalue_t q, unsigned int flags, struct socket_info* force_socket); + + /* * Iterate through the list of transaction branches */ @@ -56,6 +60,10 @@ void init_branch_iterator(void); char* next_branch(int* len, qvalue_t* q, char** dst_uri, int* dst_len, struct socket_info** force_socket); +char* get_branch( unsigned int i, int* len, qvalue_t* q, str* dst_uri, + str* path, unsigned int *flags, struct socket_info** force_socket); + + /* * Empty the array of branches */

1 0

git:janakj/kcore: Fix path to msg_parser.h
by Jan Janak 16 Mar '09

16 Mar '09

Module: sip-router Branch: janakj/kcore Commit: cec40bc490b3ef6c0a8d5dcbf7ef6f72911de7fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cec40bc… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 16 01:36:01 2009 +0100 Fix path to msg_parser.h --- lib/kcore/parse_pai.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/kcore/parse_pai.h b/lib/kcore/parse_pai.h index 0f632e9..3f6c016 100644 --- a/lib/kcore/parse_pai.h +++ b/lib/kcore/parse_pai.h @@ -29,7 +29,7 @@ #ifndef PARSE_PAI_H #define PARSE_PAI_H -#include "../../msg_parser.h" +#include "../../parser/msg_parser.h" #include "../../parser/parse_to.h"

1 0

git:janakj/kcore: Adding P-Preferred-Identity header parser from kamailio core
by Jan Janak 15 Mar '09

15 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 822a61e21b628272861a1dad6ba571acdf819c8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=822a61e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 15 17:55:11 2009 +0100 Adding P-Preferred-Identity header parser from kamailio core --- lib/kcore/parse_ppi.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/parse_ppi.h | 52 +++++++++++++++++++++ 2 files changed, 174 insertions(+), 0 deletions(-) diff --git a/lib/kcore/parse_ppi.c b/lib/kcore/parse_ppi.c new file mode 100644 index 0000000..791c3aa --- /dev/null +++ b/lib/kcore/parse_ppi.c @@ -0,0 +1,122 @@ +/* + * $Id$ + * + * 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 P-Preferred-Identity header parser + * \ingroup parser + */ + +#include "parse_ppi.h" +#include "parse_to.h" +#include "parse_uri.h" +#include <stdlib.h> +#include <string.h> +#include "../dprint.h" +#include "msg_parser.h" +#include "../ut.h" +#include "../errinfo.h" +#include "../mem/mem.h" + + +/*! + * \brief This method is used to parse P-Preferred-Identity header (RFC 3325). + * + * Currently only one name-addr / addr-spec is supported in the header + * and it must contain a sip or sips URI. + * \param msg sip msg + * \return 0 on success, -1 on failure. + */ +int parse_ppi_header( struct sip_msg *msg ) +{ + struct to_body* ppi_b; + + if ( !msg->ppi && + (parse_headers(msg, HDR_PPI_F,0)==-1 || !msg->ppi)) { + goto error; + } + + /* maybe the header is already parsed! */ + if (msg->ppi->parsed) + return 0; + + /* bad luck! :-( - we have to parse it */ + /* first, get some memory */ + ppi_b = pkg_malloc(sizeof(struct to_body)); + if (ppi_b == 0) { + LM_ERR("out of pkg_memory\n"); + goto error; + } + + /* now parse it!! */ + memset(ppi_b, 0, sizeof(struct to_body)); + parse_to(msg->ppi->body.s, + msg->ppi->body.s + msg->ppi->body.len+1, + ppi_b); + if (ppi_b->error == PARSE_ERROR) { + LM_ERR("bad P-Preferred-Identity header\n"); + pkg_free(ppi_b); + goto error; + } + msg->ppi->parsed = ppi_b; + + return 0; + error: + return -1; +} + + +/*! + * \brief Parse P-Preferred-Identity header URI + */ +struct sip_uri *parse_ppi_uri(struct sip_msg *msg) +{ + struct to_body *tb = NULL; + + if(msg==NULL) + return NULL; + + if(parse_ppi_header(msg)<0) + { + LM_ERR("cannot parse P-P-I header\n"); + return NULL; + } + + if(msg->ppi==NULL || get_ppi(msg)==NULL) + return NULL; + + tb = get_ppi(msg); + + if(tb->parsed_uri.user.s!=NULL || tb->parsed_uri.host.s!=NULL) + return &tb->parsed_uri; + + if (parse_uri(tb->uri.s, tb->uri.len , &tb->parsed_uri)<0) + { + LM_ERR("failed to parse P-P-I URI\n"); + memset(&tb->parsed_uri, 0, sizeof(struct sip_uri)); + set_err_info(OSER_EC_PARSER, OSER_EL_MEDIUM, "error parsing P-P-I URI"); + set_err_reply(400, "bad P-Preferred-Identity uri"); + return NULL; + } + + return &tb->parsed_uri; +} diff --git a/lib/kcore/parse_ppi.h b/lib/kcore/parse_ppi.h new file mode 100644 index 0000000..ff0d26c --- /dev/null +++ b/lib/kcore/parse_ppi.h @@ -0,0 +1,52 @@ +/* + * $Id$ + * + * 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 P-Preferred-Identity header parser + * \ingroup parser + */ + +#ifndef PARSE_PPI_H +#define PARSE_PPI_H + +#include "msg_parser.h" + + +/*! casting macro for accessing P-Preferred-Identity body */ +#define get_ppi(p_msg) ((struct to_body*)(p_msg)->ppi->parsed) + + +/*! + * \brief This method is used to parse P-Preferred-Identity header (RFC 3325). + * + * Currently only one name-addr / addr-spec is supported in the header + * and it must contain a sip or sips URI. + * \param msg sip msg + * \return 0 on success, -1 on failure. + */ +int parse_ppi_header( struct sip_msg *msg); + +struct sip_uri *parse_ppi_uri(struct sip_msg *msg); + +#endif /* PARSE_PPI_H */

1 0

git:janakj/kcore: Fix paths to headers in the sip-router core.
by Jan Janak 15 Mar '09

15 Mar '09

Module: sip-router Branch: janakj/kcore Commit: ebf293427e8e385ca8c03373c520b23073e627ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebf2934… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 15 17:54:18 2009 +0100 Fix paths to headers in the sip-router core. --- lib/kcore/parse_pai.c | 12 ++++++------ lib/kcore/parse_pai.h | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/kcore/parse_pai.c b/lib/kcore/parse_pai.c index b047eb6..5cd580f 100644 --- a/lib/kcore/parse_pai.c +++ b/lib/kcore/parse_pai.c @@ -24,14 +24,14 @@ * \ingroup parser */ -#include "parse_from.h" -#include "parse_to.h" +#include "../../parser/parse_from.h" +#include "../../parser/parse_to.h" #include <stdlib.h> #include <string.h> -#include "../dprint.h" -#include "msg_parser.h" -#include "../ut.h" -#include "../mem/mem.h" +#include "../../dprint.h" +#include "../../parser/msg_parser.h" +#include "../../ut.h" +#include "../../mem/mem.h" /*! * This method is used to parse P-Asserted-Identity header (RFC 3325). diff --git a/lib/kcore/parse_pai.h b/lib/kcore/parse_pai.h index f9af2fc..0f632e9 100644 --- a/lib/kcore/parse_pai.h +++ b/lib/kcore/parse_pai.h @@ -29,7 +29,8 @@ #ifndef PARSE_PAI_H #define PARSE_PAI_H -#include "msg_parser.h" +#include "../../msg_parser.h" +#include "../../parser/parse_to.h" /*! casting macro for accessing P-Asserted-Identity body */

1 0

git:janakj/kcore: Merge branch 'sr' into kcore
by Jan Janak 15 Mar '09

15 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 1e7d236d330626eb6d564cd8dab5a5c40cea8458 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e7d236… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 15 17:51:58 2009 +0100 Merge branch 'sr' into kcore * sr: (33 commits) Kamailio compatiblity: Function get_diversion_param Kamailio compatibility: function reset_dst_uri Support for P-Preferred-Identity and P-Asserted-Identity in the core. Export parse_phostport function to modules. Functions to set/reset/test per-branch flags. Added missing hash_func.h header MDString Array was renamed to MD5StringArray Kamailio compatibility: Rename MDStringArray to MD5StringArray timers: helpers for forking separate timer procs Export get_sock_info_list function to modules K. compatibility members of the branch structure in dset.c Few kamailio compatiblity macros destroy_avps kamailio compatiblity function. Remove function replace_len which is no longer needed. Kamailio compatibility changes: replace_build Importing kamailio fixes into the sip-router version of re.c Use parse_repl from within subst_parser function. Kamailio compatiblity changes: REPLACE_BUFFER_SIZE Kamailio compatibility: parse_repl Kamailio compatibility declarations ... ---

1 0

git:janakj/kcore: Fixing the path to headers in the sip-router core.
by Jan Janak 15 Mar '09

15 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 54e0101a3ef3502d24b9cd7e45f50ba69b850f50 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54e0101… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 15 17:57:29 2009 +0100 Fixing the path to headers in the sip-router core. --- lib/kcore/parse_ppi.c | 14 +++++++------- lib/kcore/parse_ppi.h | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/kcore/parse_ppi.c b/lib/kcore/parse_ppi.c index 791c3aa..5857709 100644 --- a/lib/kcore/parse_ppi.c +++ b/lib/kcore/parse_ppi.c @@ -27,15 +27,15 @@ */ #include "parse_ppi.h" -#include "parse_to.h" -#include "parse_uri.h" +#include "../../parser/parse_to.h" +#include "../../parser/parse_uri.h" #include <stdlib.h> #include <string.h> -#include "../dprint.h" -#include "msg_parser.h" -#include "../ut.h" -#include "../errinfo.h" -#include "../mem/mem.h" +#include "../../dprint.h" +#include "../../parser/msg_parser.h" +#include "../../ut.h" +#include "errinfo.h" +#include "../../mem/mem.h" /*! diff --git a/lib/kcore/parse_ppi.h b/lib/kcore/parse_ppi.h index ff0d26c..cb276b3 100644 --- a/lib/kcore/parse_ppi.h +++ b/lib/kcore/parse_ppi.h @@ -30,7 +30,8 @@ #ifndef PARSE_PPI_H #define PARSE_PPI_H -#include "msg_parser.h" +#include "../../parser/msg_parser.h" +#include "../../parser/parse_to.h" /*! casting macro for accessing P-Preferred-Identity body */

1 0

git:janakj/kcore: P-Asserted-Identity parser from kamailio core
by Jan Janak 15 Mar '09

15 Mar '09

Module: sip-router Branch: janakj/kcore Commit: bbbc6625cef466839d25fd7f95e99d6a6045d645 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbbc662… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 15 17:42:45 2009 +0100 P-Asserted-Identity parser from kamailio core This patch adds the P-Asserted-Identity parser from the kamailio core to the libkcore library. --- lib/kcore/parse_pai.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/parse_pai.h | 44 ++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 0 deletions(-) diff --git a/lib/kcore/parse_pai.c b/lib/kcore/parse_pai.c new file mode 100644 index 0000000..b047eb6 --- /dev/null +++ b/lib/kcore/parse_pai.c @@ -0,0 +1,77 @@ +/* + * 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 P-Asserted-Identity header parser + * \ingroup parser + */ + +#include "parse_from.h" +#include "parse_to.h" +#include <stdlib.h> +#include <string.h> +#include "../dprint.h" +#include "msg_parser.h" +#include "../ut.h" +#include "../mem/mem.h" + +/*! + * This method is used to parse P-Asserted-Identity header (RFC 3325). + * + * Currently only one name-addr / addr-spec is supported in the header + * and it must contain a sip or sips URI. + * \param msg sip msg + * \return 0 on success, -1 on failure. + */ +int parse_pai_header( struct sip_msg *msg ) +{ + struct to_body* pai_b; + + if ( !msg->pai && (parse_headers(msg, HDR_PAI_F,0)==-1 || !msg->pai)) { + goto error; + } + + /* maybe the header is already parsed! */ + if (msg->pai->parsed) + return 0; + + /* bad luck! :-( - we have to parse it */ + /* first, get some memory */ + pai_b = pkg_malloc(sizeof(struct to_body)); + if (pai_b == 0) { + LM_ERR("out of pkg_memory\n"); + goto error; + } + + /* now parse it!! */ + memset(pai_b, 0, sizeof(struct to_body)); + parse_to(msg->pai->body.s, msg->pai->body.s + msg->pai->body.len+1, pai_b); + if (pai_b->error == PARSE_ERROR) { + LM_ERR("bad P-Asserted-Identity header\n"); + pkg_free(pai_b); + goto error; + } + msg->pai->parsed = pai_b; + + return 0; +error: + return -1; +} diff --git a/lib/kcore/parse_pai.h b/lib/kcore/parse_pai.h new file mode 100644 index 0000000..f9af2fc --- /dev/null +++ b/lib/kcore/parse_pai.h @@ -0,0 +1,44 @@ +/* + * + * 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 P-Asserted-Identity header parser + * \ingroup parser + */ + +#ifndef PARSE_PAI_H +#define PARSE_PAI_H + +#include "msg_parser.h" + + +/*! casting macro for accessing P-Asserted-Identity body */ +#define get_pai(p_msg) ((struct to_body*)(p_msg)->pai->parsed) + + +/*! + * P-Asserted-Identity header field parser + */ +int parse_pai_header( struct sip_msg *msg); + +#endif /* PARSE_PAI_H */

1 0

git:master: Add sock_str (si as string) to struct socket_info.
by Jan Janak 15 Mar '09

15 Mar '09

Module: sip-router Branch: master Commit: bc4ee02272f15c540e1010400542e2b2550e9524 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc4ee02… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 15 23:38:32 2009 +0100 Add sock_str (si as string) to struct socket_info. This patch adds a new variable to the structure socket_info. The variable contains a string representation of the socket in form 'proto:address:port'. --- ip_addr.h | 1 + socket_info.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/ip_addr.h b/ip_addr.h index fdaf6f3..50bcbe4 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -113,6 +113,7 @@ struct socket_info{ struct socket_info* prev; unsigned short port_no; /* port number */ char proto; /* tcp or udp*/ + str sock_str; /* Socket proto, ip, and port as string */ struct addr_info* addr_info_lst; /* extra addresses (e.g. SCTP mh) */ }; diff --git a/socket_info.c b/socket_info.c index abd3064..8fa909b 100644 --- a/socket_info.c +++ b/socket_info.c @@ -268,6 +268,7 @@ static void free_sock_info(struct socket_info* si) if(si->address_str.s) pkg_free(si->address_str.s); if(si->port_no_str.s) pkg_free(si->port_no_str.s); if (si->addr_info_lst) free_addr_info_lst(&si->addr_info_lst); + if(si->sock_str.s) pkg_free(si->sock_str.s); } } @@ -298,6 +299,42 @@ static char* get_proto_name(unsigned short proto) } +/* Fill si->sock_str with string representing the socket_info structure, + * format of the string is 'proto:address:port'. Returns 0 on success and + * negative number on failure. + */ +static int fix_sock_str(struct socket_info* si) +{ + char* p; + str proto; + + if (si->sock_str.s) pkg_free(si->sock_str.s); + + proto.s = get_proto_name(si->proto); + proto.len = strlen(proto.s); + + si->sock_str.len = proto.len + si->address_str.len + + si->port_no_str.len + 2; + + si->sock_str.s = pkg_malloc(si->sock_str.len + 1); + if (si->sock_str.s == NULL) { + LOG(L_ERR, "fix_sock_str: No pkg memory left\n"); + return -1; + } + p = si->sock_str.s; + memcpy(p, proto.s, proto.len); + p += proto.len; + *p = ':'; p++; + memcpy(p, si->address_str.s, si->address_str.len); + p += si->address_str.len; + *p = ':'; p++; + memcpy(p, si->port_no_str.s, si->port_no_str.len); + p += si->port_no_str.len; + *p = '\0'; + + return 0; +} + /* returns 0 if support for the protocol is not compiled or if proto is invalid */ @@ -1028,6 +1065,8 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) &ail->flags, type_flags, si) !=0 ) goto error; } + + if (fix_sock_str(si) < 0) goto error; #ifdef EXTRA_DEBUG printf(" %.*s [%s]:%s%s\n", si->name.len,

1 0

git:master: Support for P-Preferred-Identity and P-Asserted-Identity in the core.
by Jan Janak 15 Mar '09

15 Mar '09

Module: sip-router Branch: master Commit: c8f8eacbb4c8b6ea1ffe345ee2b9e3239a040ef1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8f8eac… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 15 17:17:24 2009 +0100 Support for P-Preferred-Identity and P-Asserted-Identity in the core. This patch adds variables that are needed by the P-Preferred-Identity and P-Asserted-Identity parsers in the libkcore library. --- parser/hf.h | 5 ++++- parser/msg_parser.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/parser/hf.h b/parser/hf.h index 3c56ef7..7196833 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -107,7 +107,8 @@ enum _hdr_types_t { HDR_IDENTITY_T /* Identity header field */, HDR_IDENTITY_INFO_T /* Identity-info header field */, HDR_RETRY_AFTER_T /* Retry-After header field */, - + HDR_PPI_T /**< P-Preferred-Identity header field */, + HDR_PAI_T /**< P-Asserted-Identity header field */, HDR_EOH_T /* End of message header */ }; @@ -175,6 +176,8 @@ typedef unsigned long long hdr_flags_t; #define HDR_IDENTITY_F HDR_F_DEF(IDENTITY) #define HDR_IDENTITY_INFO_F HDR_F_DEF(IDENTITY_INFO) #define HDR_RETRY_AFTER_F HDR_F_DEF(RETRY_AFTER) +#define HDR_PPI_F HDR_F_DEF(PPI) +#define HDR_PAI_F HDR_F_DEF(PAI) #define HDR_OTHER_F HDR_F_DEF(OTHER) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 821f3a5..64d1310 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -255,6 +255,8 @@ typedef struct sip_msg { struct hdr_field* date; struct hdr_field* identity; struct hdr_field* identity_info; + struct hdr_field* pai; + struct hdr_field* ppi; char* eoh; /* pointer to the end of header (if found) or null */ char* unparsed; /* here we stopped parsing*/

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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