sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

git:master: Adding function is_peer_verified from kamailio

by Jan Janak

Module: sip-router Branch: master Commit: d1517292e926c2bf66df23767629695681e4ef15 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d151729… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 18:47:43 2009 +0100 Adding function is_peer_verified from kamailio --- modules/tls/tls_mod.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 8e45043..f3f56b1 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -96,6 +96,8 @@ static int mod_init(void); static int mod_child(int rank); static void destroy(void); +static int is_peer_verified(struct sip_msg* msg, char* foo, char* foo2); + MODULE_VERSION @@ -185,7 +187,9 @@ gen_lock_t* tls_cfg_lock = NULL; * Exported functions */ static cmd_export_t cmds[] = { - {0, 0, 0, 0, 0} + {"is_peer_verified", (cmd_function)is_peer_verified, 0, 0, 0, + REQUEST_ROUTE}, + {0,0,0,0,0,0} }; @@ -395,3 +399,62 @@ static int mod_child(int rank) static void destroy(void) { } + + +static int is_peer_verified(struct sip_msg* msg, char* foo, char* foo2) +{ + struct tcp_connection *c; + SSL *ssl; + long ssl_verify; + X509 *x509_cert; + + DBG("started...\n"); + if (msg->rcv.proto != PROTO_TLS) { + ERR("proto != TLS --> peer can't be verified, return -1\n"); + return -1; + } + + DBG("trying to find TCP connection of received message...\n"); + + c = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, tls_con_lifetime); + if (c && c->type != PROTO_TLS) { + ERR("Connection found but is not TLS\n"); + tcpconn_put(c); + return -1; + } + + if (!c->extra_data) { + LM_ERR("no extra_data specified in TLS/TCP connection found." + " This should not happen... return -1\n"); + tcpconn_put(c); + return -1; + } + + ssl = ((struct tls_extra_data*)c->extra_data)->ssl; + + ssl_verify = SSL_get_verify_result(ssl); + if ( ssl_verify != X509_V_OK ) { + LM_WARN("verification of presented certificate failed... return -1\n"); + tcpconn_put(c); + return -1; + } + + /* now, we have only valid peer certificates or peers without certificates. + * Thus we have to check for the existence of a peer certificate + */ + x509_cert = SSL_get_peer_certificate(ssl); + if ( x509_cert == NULL ) { + LM_WARN("tlsops:is_peer_verified: WARNING: peer did not presented " + "a certificate. Thus it could not be verified... return -1\n"); + tcpconn_put(c); + return -1; + } + + X509_free(x509_cert); + + tcpconn_put(c); + + LM_DBG("tlsops:is_peer_verified: peer is successfuly verified" + "...done\n"); + return 1; +}

15 years, 9 months

git:master: Switch to the openser module interface version

by Jan Janak

Module: sip-router Branch: master Commit: 7c0dd0275e94eb2c9ad787241952dcfc1c3e4ed9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c0dd02… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 18:36:18 2009 +0100 Switch to the openser module interface version We need to switch the tls module to the openser version of module interface in order to make all the tls related pseudo-variables available. This comes with a price, we won't be able to use the TLS rpc commands temporarily because they can only be exported through the SER version of the module interface. But there are only two functions available through the rpc interface anyway and not having them harms less than not having the pseudo-variables. --- modules/tls/Makefile | 2 +- modules/tls/tls_mod.c | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index 8c2671b..30dacf4 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -17,6 +17,6 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto \ # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" -DEFS+=-DSER_MOD_INTERFACE +DEFS+=-DOPENSER_MOD_INTERFACE include ../../Makefile.modules diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 7c1b56a..8e45043 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -220,15 +220,18 @@ static param_export_t params[] = { * Module interface */ struct module_exports exports = { - "tls", - cmds, /* Exported functions */ - tls_rpc, /* RPC methods */ - params, /* Exported parameters */ - mod_init, /* module initialization function */ - 0, /* response function*/ - destroy, /* destroy function */ - 0, /* cancel function */ - mod_child /* per-child init function */ + "tlsops", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* Exported functions */ + params, /* Exported parameters */ + 0, /* exported statistics */ + 0, /* exported MI functions */ + tls_pv, /* exported pseudo-variables */ + 0, /* extra processes */ + mod_init, /* module initialization function */ + 0, /* response function */ + destroy, /* destroy function */ + mod_child /* child initialization function */ };

15 years, 9 months

git:janakj/kcore: Merge commit 'sr/master' into kcore

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 4a308b52d343e768f5e60f9285632b405c7591b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a308b5… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 13:27:21 2009 +0100 Merge commit 'sr/master' into kcore * commit 'sr/master': (63 commits) Kamailio compatibility: Privacy header field name parser Kamailio compatibility: Privacy header field name parser Replace TCP_BUF_SIZE with a cfg_get(..). Remove shm_str_dup function. Define SER_MOD_INTERFACE in Makefile. Do not clone sip_msg->body into shared memory Update the SDP parser for the sip-router core. New element of sip_msg structure with pointer to parsed body Compile also the files in parser/sdp SDP document parser Support for mixed content type. Teach the parser recognize PRACK and UPDATE methods Kamailio compatiblity: Added pointer to a free function to tm callbacks - a set of minimalistic config files for testing purposes - tls module todo - default key and certificate names changed to ser-selfsigned* - updated to the latest changes in the cfg parser - Use the new configuration file parser - fixed includes (rm malloc.h) due to portability problems - shm_str_dup and shm_asciiz_dup set the destination buffer to NULL if ... ---

15 years, 9 months

git:janakj/kcore: Moving socket related code from snmpstats module into libkcore

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 1d9df499a688a4202518f1622ca45eba9eac1f9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d9df49… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 13:28:18 2009 +0100 Moving socket related code from snmpstats module into libkcore Other modules will be able to access socket related statistics directly from the shared library (this is currently used by two modules, ratelimit and snmpstats. Signed-off-by: Jan Janak <jan(a)iptel.org> --- lib/kcore/statistics.c | 359 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/statistics.h | 46 ++++++ 2 files changed, 405 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1d9…

15 years, 9 months

git:janakj/kcore: Added privacy header parser from kamailio to kcore lib

by Jan Janak

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 +++++++++++++++++++++++++++++++++++++++++++++ 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 */

15 years, 9 months

git:master: Kamailio compatibility: Privacy header field name parser

by Jan Janak

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 them. --- modules/tm/sip_msg.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index 0ebbda4..6b31eb0 100644 --- a/modules/tm/sip_msg.c +++ b/modules/tm/sip_msg.c @@ -490,6 +490,7 @@ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ) case HDR_PPI_T: case HDR_PAI_T: case HDR_PATH_T: + case HDR_PRIVACY_T: /* we ignore them for now even if they have something parsed*/ break; }/*switch*/ @@ -893,6 +894,11 @@ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ) new_msg->path = new_hdr; } break; + case HDR_PRIVACY_T: + if (!HOOK_SET(privacy)) { + new_msg->privacy = new_hdr; + } + break; }/*switch*/ if ( last_hdr )

15 years, 9 months

git:master: Kamailio compatibility: Privacy header field name parser

by Jan Janak

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 +++++++++++++++++++++++++++++++++++++++++++++++++ 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) \

15 years, 9 months

New commits on branch master

by Jan Janak

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 with a function in ../../ut.h URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=371cb37… Author: Jan Janak <jan(a)iptel.org> Date: Thu Mar 26 14:33:39 2009 +0100 Define SER_MOD_INTERFACE in Makefile. This patch adds -DSER_MOD_INTERFACE to the modules Makefile, this is needed to make ser modules compile with the sip router core. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91e9758… Merge: fc9cfc98af91092de9e12533c255778080b045dd 3018841f0fdc23caa5e8155a5b16bc1904616505 Author: Jan Janak <jan(a)iptel.org> Date: Thu Mar 26 14:23:27 2009 +0100 Merge ser tls module into the sip-router repository * commit 'ser/modules/tls': (50 commits) - a set of minimalistic config files for testing purposes - tls module todo - default key and certificate names changed to ser-selfsigned* - updated to the latest changes in the cfg parser - Use the new configuration file parser - fixed includes (rm malloc.h) due to portability problems - shm_str_dup and shm_asciiz_dup set the destination buffer to NULL if - Convert all relative pathnames of files to absolute with - modified function get_pathname to return path relative to the - support for setting the source address in tcp_send() and tcpconn_get() - updated all the child_init users to ignore or treat specially the - added low_mem_threshold1 & low_mem_threshold2 (the ammount of free memory - tls: tls_update_fd improvement - use SSL_set_fd only when the connection is - workaround for openssl bug #1491 (multiple problems on low memory): tls - malloc debugging for openssl and random malloc null returns turened off - added tls module documentation (not yet complete, still missing select, rpc and better tls.cfg description). - make tar doesn't exclude tls*, but instead tls/* - call tls_shutdown() only if tls_set_fd() was succesfull - tls: openssl kerberos malloc bug (# 1467) fixed on cvs (0.9.8e-dev and 0.9.9-dev), so add extra checks for enabling the workarround (which disables kerberos) only when necessary: if openssl compiled with kerberos support, and openssl < 0.9.8e-beta1 or openssl between 0.9.9-dev and 0.9.9-beta1 apply workarround. - tls-core.patch removed (no longer necessary) ... URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3018841… Author: Jan Janak <jan(a)iptel.org> Date: Thu Jun 26 15:43:26 2008 +0000 - a set of minimalistic config files for testing purposes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44fc09b… Author: Jan Janak <jan(a)iptel.org> Date: Thu Jun 26 11:49:22 2008 +0000 - tls module todo URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82b840c… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jun 23 17:48:40 2008 +0000 - default key and certificate names changed to ser-selfsigned* - added ser_certs.sh URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb718b6… Author: Jan Janak <jan(a)iptel.org> Date: Thu Jun 12 16:02:04 2008 +0000 - updated to the latest changes in the cfg parser URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d037bb9… Author: Jan Janak <jan(a)iptel.org> Date: Fri Jun 6 00:03:06 2008 +0000 - Use the new configuration file parser URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87db435… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Mar 2 16:09:28 2008 +0000 - fixed includes (rm malloc.h) due to portability problems URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b717dfd… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 11 12:39:49 2008 +0000 - shm_str_dup and shm_asciiz_dup set the destination buffer to NULL if the source is NULL too URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d128c59… Author: Jan Janak <jan(a)iptel.org> Date: Fri Feb 8 05:38:39 2008 +0000 - Convert all relative pathnames of files to absolute with respect to the main SER configuration file (the external TLS config file and modparams) or the TLS config file (file included from there). - Use get_abs_pathname from sip_router/ut.c instead of the local function get_pathname URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa4ac2d… Author: Jan Janak <jan(a)iptel.org> Date: Tue Feb 5 08:27:42 2008 +0000 - modified function get_pathname to return path relative to the path of the main SER configuration file if it does not start with /, this is much more sensible then just pre-pending CFG_DIR, it is possible to write modparam("tls", "config", "tls.cfg") and still control the location of the configuration files using -f cmd line option - the function now returns result allocated with malloc, not pkg_malloc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=878bda9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 1 00:05:40 2007 +0000 - support for setting the source address in tcp_send() and tcpconn_get() (should allow for a better tcp force_send_socket() in the future) - add multiple aliases for each connection, to cover all the search possiblities: (dst_ip, dst_port), (local_ip, dst_ip, dst_port), (local_ip, local_port, dst_ip, dst_port). - improved connection hash function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30b49d1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jun 7 21:46:56 2007 +0000 - updated all the child_init users to ignore or treat specially the PROC_INIT rank URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66fff01… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 28 01:38:47 2007 +0000 - added low_mem_threshold1 & low_mem_threshold2 (the ammount of free memory from which tls operations will start to fail preemptively is now configurable; by default the value depends on the number of processes) - doc update URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30e67c4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 26 23:32:29 2007 +0000 - tls: tls_update_fd improvement - use SSL_set_fd only when the connection is not fully init. and SSL_get_*bio/BIO_set_fd in the other cases (much faster and avoids SSL_mallocs). URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=433e689… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 23 23:24:32 2007 +0000 - workaround for openssl bug #1491 (multiple problems on low memory): tls functions will preemptively fail if the available memory drops under a certain treshold (for now a very conservative value based on the maximum possible number of simultaneously executing connects/accepts - expect something >= 20MB, depending on the number of processes) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d980a8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 21 20:29:04 2007 +0000 - malloc debugging for openssl and random malloc null returns turened off (I've commited this yesterday by mistake) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32e4977… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 21 00:54:44 2007 +0000 - added tls module documentation (not yet complete, still missing select, rpc and better tls.cfg description). Test case: try to read the generated README and see if it makes sense and you uderstand at least 88,73% from it. Prerequisites: well rested and a blood alcohol level within legal driving limits. WARNING: known to induce strong drowsiness. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e4d732… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 20 19:41:14 2007 +0000 - make tar doesn't exclude tls*, but instead tls/* - don't append -tls to the version number unless CORE_TLS is used (there's enough information in the flags to see if support for the tls modules is enabled) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5777d86… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 16 21:43:17 2007 +0000 - call tls_shutdown() only if tls_set_fd() was succesfull (fixes a tricky bug that can appear on low memory conditions)A - tls_dump_cert_info takes into account the possibility of a failing X609_NAME_oneline() (can happen on low memory) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=560a42b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 13 13:22:57 2007 +0000 - tls: openssl kerberos malloc bug (# 1467) fixed on cvs (0.9.8e-dev and 0.9.9-dev), so add extra checks for enabling the workarround (which disables kerberos) only when necessary: if openssl compiled with kerberos support, and openssl < 0.9.8e-beta1 or openssl between 0.9.9-dev and 0.9.9-beta1 apply workarround. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9557b1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Feb 10 19:02:56 2007 +0000 - tls-core.patch removed (no longer necessary) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a8994c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Feb 10 19:02:04 2007 +0000 - use the new tls hooks api (the core patch is no longer necessary) - renamed some of tls_.* functions to tls_h_.* to avoid name conflicts with the core - fixed shutdown tls before tcp bug (if ser was stopped while tls connections were still active, the tls module was destroyed before tcp => crash when tcp tried to close the tls connections). Now all the destroy operation are moved into the new destroy_tls hook and the module destroy function is empty. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd75088… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 5 10:20:54 2007 +0000 - added missing header files to make tls module compile on FreeBSD reported by Atle Samuelsen URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c20ee39… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 2 15:17:52 2007 +0000 - fixed missing warning quotes (problem with older compilers) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc660aa… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 1 04:24:06 2007 +0000 - openssl compression bug detect/workaround enabled at runtime (if zlib compression is detected, we replace openssl version with ours). The previous version had this fix but it was enabled only at compile-time. - SSL_OP_TLS_BLOCK_PADDING_BUG option disabled if 0.9.8 <= openssl < 0.9.8c and compresion is used (check at runtime) - more start-up sanity checks: - check if openssl used library version is close enough to the library with which the tls module was compiled (header files) For now it checks for the same major, minor and fix level (e.g. 0.9.8a && 0.9.8c are ok, 0.9.7b and 0.9.8a are not) - try to auto-detect (using the compile flags) if the used library was compiled with kerberos support and if the tls module was compiled with the same setting (or else we won't be able to enable the kerberos bug workarround). - more verbose start-up messages and errors - warning fixes - 2 new module parameters: tls_disable_compression (default 0) tls_force_run (default 0) -- will ignore the start-up sanity checks and continue running even if the library version/options are different References: openssl bugs #1468, #1467 & #1204 (http://rt.openssl.org) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36cb8fa… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jan 26 23:11:21 2007 +0000 - workarround for openssl kerberos malloc bug: openssl kerberos code in kssl.c uses libc malloc/free/calloc instead of the OPENSSL* versions (set using CRYPTO_set_mem_functions()). In ser ssl connections "move" between processes and so everything must be allocated in shared mem. If the wrong malloc function are called ser will eventually crash. This workarround tries to disable kerberos support each time a new SSL structure is created. For this fix to work is important to either use statically linked openssl or re-compile ser on the target machine (if openssl is linked dynamically then it must use the same compilation options as the machine on which ser is compiled). Bug reporterd by Atle Samuelsen <clona(a)cyberhouse.no>. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f8edfa… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jan 26 19:56:49 2007 +0000 - typo fix: don't attempt to apply the compression fix workarround if no zlib compression was found URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a558c65… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jan 24 18:01:54 2007 +0000 - tls fix: set openssl locking functions (should be stable even under high load, lost of connections, and multi-cpu machines) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2aa9fd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jan 17 20:24:05 2007 +0000 - timeouts fixed (all the tcp timeouts use now ticks and not seconds) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba83663… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jan 17 10:39:09 2007 +0000 - The config file parser did not always return proper variable value closes SER-206 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2810f7a… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Nov 27 13:55:51 2006 +0000 @tls.peer.verified did not set the result buffer URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c69b8d9… Author: Jan Janak <jan(a)iptel.org> Date: Fri Nov 24 07:37:28 2006 +0000 - fixed wrong comparison values, reported by Klaus Darilion closes SER-108 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5c9bd6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Nov 15 19:55:13 2006 +0000 - tls init updated to the new get_max_procs() use (not allowed from mod_init()) - tls-core.patch updated to the latest tcp changes - lots of warnings and/or small errors fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14b8a30… Author: Jan Halla <hallik(a)iptel.org> Date: Sat Nov 4 01:44:34 2006 +0000 tls-core.patch updated to be useable with current SER CVS HEAD URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=079850e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 19 16:13:27 2006 +0000 - applied patch from Dragos Vingarzan <vingarzan(a)fokus.fraunhofer.de> which moves all the forking part into 2 functions in pt.c (fork_process and fork_tcp_process). - added PROC_NOCHLDINIT rank value for Dragos's fork_process (if this value is used as child_id/rank_value the mod_child functions will not be called) - added register_procs(processes_no), used from mod_init when a module knows that it will fork some children (replaces the old process_count++ / the patch's estimated_process_count++) - added get_max_procs(): returns the maximum (estimated) number of processes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e618d0e… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 3 18:23:47 2006 +0000 - deallocate lock only if it was really allocated - implemented tls.init (lists all existing TLS connections) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31c1662… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 3 15:52:11 2006 +0000 - fixed file comments - added missing defines in header files - added missing Id tags URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=742653f… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 3 12:35:41 2006 +0000 - fixed get_ssl (TCP extra data contains pointer to a different structure) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5303a64… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 3 12:26:07 2006 +0000 - make sure tls modparams do not overview defaults for the external configuration file URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c71c178… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 3 12:23:44 2006 +0000 - a couple of typos fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=331ddcf… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 3 12:22:01 2006 +0000 - minor beautification URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c441707… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 3 12:20:45 2006 +0000 - Example configuration file for tls module URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=38a6647… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 3 11:26:53 2006 +0000 - Support for external TLS configuration file - support for relative path names (CFG_DIR will be added automaticaly) - Support for run-time configuration re-load - tls.reload management command implemented URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88e8426… Author: Jan Janak <jan(a)iptel.org> Date: Wed Feb 22 23:41:17 2006 +0000 - fixed wrong comment URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1eadbe… Author: Jan Janak <jan(a)iptel.org> Date: Wed Feb 22 23:37:19 2006 +0000 - TLS configuration file parser (not yet integrated with rest of tls module) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca552cb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 22 13:34:00 2006 +0000 - by default don't require a certificate URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f875827… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 22 13:10:27 2006 +0000 - by default don't verify any certs (server or client) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6526a6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 22 13:00:36 2006 +0000 - applied Klaus Darilion patches (closes SER-98): - updated tls-core.patch - allow configuration of the default TLS-client-domain - more TLS logging during TLS initalisation and when TLS verification fails - use TLSv1 as default method - debian build: libradius-ng-dev as another alternative to the various libradius* URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ddfc8f3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 20 23:31:18 2006 +0000 - log message fix for tls_connect (s/dst/src) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0eb2c7… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jan 30 16:05:39 2006 +0000 - fixed @tls.cipher.bits - noisy error turned into debugging message URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd0647f… Author: Jan Janak <jan(a)iptel.org> Date: Sat Jan 28 12:34:31 2006 +0000 Preliminary TLS module (requires core patch which is attached), the module contains: - Many bugfixes and better implementation of tls_write and tls_read by Andrei - openssl compression fix by Andrei - extended tls multi-domain support (most parameters can be configured to different values in different domains) - support for outgoing domains (not complete) - support for certificate based authentication through selects ( if @tls.peer == "Bob") ... - the tls code is merge of experimental/tls and Andrei's tls to get best of both

15 years, 9 months

PATCH: sdp parser

by Ovidiu Sas

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

15 years, 9 months

git:master: Compile also the files in parser/sdp

by Jan Janak

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 --- a/Makefile.sources +++ b/Makefile.sources @@ -14,6 +14,7 @@ sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) \ $(wildcard parser/*.c) $(wildcard parser/digest/*.c) \ $(wildcard parser/contact/*.c) $(wildcard db/*.c) \ + $(wildcard parser/sdp/*.c) \ $(wildcard rand/*.c) $(wildcard rand/isaac/*.c) ) \ $(wildcard cfg/*.c) $(auto_gen) ifeq ($(CORE_TLS), 1)

15 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev