sr-dev January 2012

sr-dev@lists.kamailio.org

25 participants
166 discussions

git:master: auth: new funtion to return WWW-Authenticate hdr in a PV
by Daniel-Constantin Mierla 16 Jan '12

16 Jan '12

Module: sip-router Branch: master Commit: bcae9bab00ee8c180993a46bb9013c8cb3173913 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcae9ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 16 18:20:58 2012 +0100 auth: new funtion to return WWW-Authenticate hdr in a PV --- modules/auth/README | 18 +++++++ modules/auth/auth_mod.c | 106 +++++++++++++++++++++++++++++++++++++++- modules/auth/doc/functions.xml | 24 +++++++++ 3 files changed, 147 insertions(+), 1 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index 692c6d8..04dbf8a 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -47,6 +47,7 @@ Daniel-Constantin Mierla 1.4.4. auth_challenge(realm, flags) 1.4.5. pv_www_authenticate(realm, passwd, flags) 1.4.6. pv_proxy_authenticate(realm, passwd, flags) + 1.4.7. auth_get_www_authenticate(realm, flags, pvdst) 1.1. Overview @@ -680,3 +681,20 @@ if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { proxy_challenge("$fd", "1"); }; ... + +1.4.7. auth_get_www_authenticate(realm, flags, pvdst) + + Build WWW-Authentication header and set the resulting value in 'pvdest' + parameter. + + Meaning of the realm and flags parameters is the same as for + pv_www_authenticate(realm, passwd, flags) + + This function can be used from ANY_ROUTE. + + Example 21. auth_get_www_authenticate +... +if (auth_get_www_authenticate("$fd", "0", "$var(wauth)")) { + xlog("www authenticate header is [$var(wauth)]\n"); +} +... diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index 8050d81..4a03af4 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -50,6 +50,9 @@ #include "../../data_lump_rpl.h" #include "../../error.h" #include "../../ut.h" +#include "../../pvapi.h" +#include "../../lvalue.h" +#include "../../mod_fix.h" #include "../../modules/sl/sl.h" #include "auth_mod.h" #include "challenge.h" @@ -90,6 +93,9 @@ static int www_challenge(struct sip_msg *msg, char* realm, char *flags); static int w_auth_challenge(struct sip_msg *msg, char* realm, char *flags); static int fixup_auth_challenge(void **param, int param_no); +static int w_auth_get_www_authenticate(sip_msg_t* msg, char* realm, + char *flags, char *dst); +static int fixup_auth_get_www_authenticate(void **param, int param_no); /* * Module parameter variables @@ -152,6 +158,8 @@ static cmd_export_t cmds[] = { fixup_pv_auth, REQUEST_ROUTE}, {"pv_proxy_authenticate", (cmd_function)pv_proxy_authenticate, 3, fixup_pv_auth, REQUEST_ROUTE}, + {"auth_get_www_authenticate", (cmd_function)w_auth_get_www_authenticate, 3, + fixup_auth_get_www_authenticate, REQUEST_ROUTE}, {"bind_auth_s", (cmd_function)bind_auth_s, 0, 0, 0 }, {0, 0, 0, 0, 0} }; @@ -642,7 +650,8 @@ static int auth_send_reply(struct sip_msg *msg, int code, char *reason, /** * */ -int auth_challenge(struct sip_msg *msg, str *realm, int flags, int hftype) +int auth_challenge_helper(struct sip_msg *msg, str *realm, int flags, int hftype, + str *res) { int ret, stale; str hf = {0, 0}; @@ -668,6 +677,11 @@ int auth_challenge(struct sip_msg *msg, str *realm, int flags, int hftype) } ret = 1; + if(res!=NULL) + { + *res = hf; + return ret; + } switch(hftype) { case HDR_AUTHORIZATION_T: if(auth_send_reply(msg, 401, "Unauthorized", @@ -695,6 +709,14 @@ error: /** * */ +int auth_challenge(struct sip_msg *msg, str *realm, int flags, int hftype) +{ + return auth_challenge_helper(msg, realm, flags, hftype, NULL); +} + +/** + * + */ static int proxy_challenge(struct sip_msg *msg, char* realm, char *flags) { int vflags = 0; @@ -817,3 +839,85 @@ static int fixup_auth_challenge(void **param, int param_no) } return 0; } + + +/** + * + */ +static int w_auth_get_www_authenticate(sip_msg_t* msg, char* realm, + char *flags, char *dst) +{ + int vflags = 0; + str srealm = {0}; + str hf = {0}; + pv_spec_t *pv; + pv_value_t val; + int ret; + + if(get_str_fparam(&srealm, msg, (fparam_t*)realm) < 0) { + LM_ERR("failed to get realm value\n"); + goto error; + } + + if(srealm.len==0) { + LM_ERR("invalid realm value - empty content\n"); + goto error; + } + + if(get_int_fparam(&vflags, msg, (fparam_t*)flags) < 0) { + LM_ERR("invalid flags value\n"); + goto error; + } + + pv = (pv_spec_t *)dst; + + ret = auth_challenge_helper(NULL, &srealm, vflags, + HDR_AUTHORIZATION_T, &hf); + + if(ret<0) + return ret; + + val.rs.s = pv_get_buffer(); + val.rs.len = 0; + if(hf.s!=NULL) + { + memcpy(val.rs.s, hf.s, hf.len); + val.rs.len = hf.len; + val.rs.s[val.rs.len] = '\0'; + pkg_free(hf.s); + } + val.flags = PV_VAL_STR; + pv->setf(msg, &pv->pvp, (int)EQ_T, &val); + + return ret; + +error: + return -1; +} + + +static int fixup_auth_get_www_authenticate(void **param, int param_no) +{ + if(strlen((char*)*param)<=0) { + LM_ERR("empty parameter %d not allowed\n", param_no); + return -1; + } + + switch(param_no) { + case 1: + return fixup_var_str_12(param, 1); + case 2: + return fixup_var_int_12(param, 1); + case 3: + if (fixup_pvar_null(param, 1) != 0) { + LM_ERR("failed to fixup result pvar\n"); + return -1; + } + if (((pv_spec_t *)(*param))->setf == NULL) { + LM_ERR("result pvar is not writeble\n"); + return -1; + } + return 0; + } + return 0; +} diff --git a/modules/auth/doc/functions.xml b/modules/auth/doc/functions.xml index f094e44..59c7422 100644 --- a/modules/auth/doc/functions.xml +++ b/modules/auth/doc/functions.xml @@ -308,4 +308,28 @@ if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { </example> </section> + <section id="auth_get_www_authenticate"> + <title> + <function moreinfo="none">auth_get_www_authenticate(realm, flags, pvdst)</function> + </title> + <para> + Build WWW-Authentication header and set the resulting value in 'pvdest' parameter. + </para> + <para>Meaning of the realm and flags parameters is the same as for + pv_www_authenticate(realm, passwd, flags)</para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title>auth_get_www_authenticate</title> + <programlisting format="linespecific"> +... +if (auth_get_www_authenticate("$fd", "0", "$var(wauth)")) { + xlog("www authenticate header is [$var(wauth)]\n"); +} +... +</programlisting> + </example> + </section> + </section>

1 0

git:master: msrp: new module to handle MSRP (RFC4975)
by Daniel-Constantin Mierla 16 Jan '12

16 Jan '12

Module: sip-router Branch: master Commit: 19e138b57e984b87c6d8eb930cd1a09422c8397f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19e138b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 16 22:40:46 2012 +0100 msrp: new module to handle MSRP (RFC4975) --- modules/msrp/Makefile | 12 + modules/msrp/README | 416 +++++++++++++++++++++++ modules/msrp/doc/Makefile | 4 + modules/msrp/doc/msrp.xml | 37 ++ modules/msrp/doc/msrp_admin.xml | 457 +++++++++++++++++++++++++ modules/msrp/msrp_env.c | 189 +++++++++++ modules/msrp/msrp_env.h | 52 +++ modules/msrp/msrp_mod.c | 394 ++++++++++++++++++++++ modules/msrp/msrp_netio.c | 345 +++++++++++++++++++ modules/msrp/msrp_netio.h | 43 +++ modules/msrp/msrp_parser.c | 698 +++++++++++++++++++++++++++++++++++++++ modules/msrp/msrp_parser.h | 138 ++++++++ modules/msrp/msrp_vars.c | 456 +++++++++++++++++++++++++ modules/msrp/msrp_vars.h | 38 +++ 14 files changed, 3279 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=19e…

1 0

git:master: core: helper function for mod fixup when all parameters are spve
by Daniel-Constantin Mierla 16 Jan '12

16 Jan '12

Module: sip-router Branch: master Commit: 182410942b81e0a9b2820068a7cc1af916f747e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1824109… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 16 16:36:24 2012 +0100 core: helper function for mod fixup when all parameters are spve --- mod_fix.c | 8 ++++++++ mod_fix.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index df0ca54..f0207e7 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -541,3 +541,11 @@ free_fixup_function mod_fix_get_fixup_free(fixup_function f) if (f == fixup_spve_str) return fixup_free_spve_str; return 0; } + +/** + * + */ +int fixup_spve_all(void** param, int param_no) +{ + return fixup_spve_null(param, 1); +} diff --git a/mod_fix.h b/mod_fix.h index 9c06bc5..1f264d1 100644 --- a/mod_fix.h +++ b/mod_fix.h @@ -128,6 +128,7 @@ int fixup_spve_uint(void** param, int param_no); int fixup_spve_str(void** param, int param_no); int fixup_free_spve_str(void** param, int param_no); +int fixup_spve_all(void** param, int param_no); /** get the corresp. free fixup function.*/ free_fixup_function mod_fix_get_fixup_free(fixup_function f);

1 0

git:master: core: two more events for handling http and msrp
by Daniel-Constantin Mierla 16 Jan '12

16 Jan '12

Module: sip-router Branch: master Commit: 51655771af791109551020506371a4f4f72d1aa3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5165577… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 13 12:46:20 2012 +0100 core: two more events for handling http and msrp - one to be called for http/1.1 end of headers for checking on '100 Continue' request - one to be called when a msrp message is received --- events.c | 26 ++++++++++++++++++++++++++ events.h | 5 +++++ tcp_conn.h | 8 ++++++++ tcp_read.c | 18 +++++++++++++++++- 4 files changed, 56 insertions(+), 1 deletions(-) diff --git a/events.c b/events.c index 0b78df8..5ad2b44 100644 --- a/events.c +++ b/events.c @@ -86,6 +86,16 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.net_dgram_in = f; else return -1; break; + case SREV_TCP_HTTP_100C: + if(_sr_events_list.tcp_http_100c==0) + _sr_events_list.tcp_http_100c = f; + else return -1; + break; + case SREV_TCP_MSRP_FRAME: + if(_sr_events_list.tcp_msrp_frame==0) + _sr_events_list.tcp_msrp_frame = f; + else return -1; + break; default: return -1; } @@ -165,6 +175,18 @@ int sr_event_exec(int type, void *data) ret = _sr_events_list.net_dgram_in(data); return ret; } else return 1; + case SREV_TCP_HTTP_100C: + if(unlikely(_sr_events_list.tcp_http_100c!=0)) + { + ret = _sr_events_list.tcp_http_100c(data); + return ret; + } else return 1; + case SREV_TCP_MSRP_FRAME: + if(unlikely(_sr_events_list.tcp_msrp_frame!=0)) + { + ret = _sr_events_list.tcp_msrp_frame(data); + return ret; + } else return 1; default: return -1; } @@ -190,6 +212,10 @@ int sr_event_enabled(int type) return (_sr_events_list.pkg_set_real_used!=0)?1:0; case SREV_NET_DGRAM_IN: return (_sr_events_list.net_dgram_in!=0)?1:0; + case SREV_TCP_HTTP_100C: + return (_sr_events_list.tcp_http_100c!=0)?1:0; + case SREV_TCP_MSRP_FRAME: + return (_sr_events_list.tcp_msrp_frame!=0)?1:0; } return 0; } diff --git a/events.h b/events.h index 465976f..1a4c5e0 100644 --- a/events.h +++ b/events.h @@ -30,6 +30,9 @@ #define SREV_PKG_SET_USED 5 #define SREV_PKG_SET_REAL_USED 6 #define SREV_NET_DGRAM_IN 7 +#define SREV_TCP_HTTP_100C 8 +#define SREV_TCP_MSRP_FRAME 9 + typedef int (*sr_event_cb_f)(void *data); @@ -41,6 +44,8 @@ typedef struct sr_event_cb { sr_event_cb_f pkg_set_used; sr_event_cb_f pkg_set_real_used; sr_event_cb_f net_dgram_in; + sr_event_cb_f tcp_http_100c; + sr_event_cb_f tcp_msrp_frame; } sr_event_cb_t; void sr_event_cb_init(void); diff --git a/tcp_conn.h b/tcp_conn.h index fe9cc00..a8a7e04 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -342,6 +342,14 @@ struct tcp_connection* tcpconn_get(int id, struct ip_addr* ip, int port, union sockaddr_union* local_addr, ticks_t timeout); +typedef struct tcp_event_info { + int type; + char *buf; + unsigned int len; + struct receive_info *rcv; + struct tcp_connection *con; +} tcp_event_info_t; + #endif diff --git a/tcp_read.c b/tcp_read.c index bdbd041..41fbbf7 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -96,6 +96,7 @@ #include <fcntl.h> /* must be included after io_wait.h if SIGIO_RT is used */ #include "tsend.h" #include "forward.h" +#include "events.h" #ifdef USE_STUN #include "ser_stun.h" @@ -994,8 +995,23 @@ skip: int msrp_process_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_info, struct tcp_connection* con) { + int ret; + tcp_event_info_t tev; + + ret = 0; LM_DBG("MSRP Message: [[>>>\n%.*s<<<]]\n", len, tcpbuf); - return 0; + if(likely(sr_event_enabled(SREV_TCP_MSRP_FRAME))) { + memset(&tev, 0, sizeof(tcp_event_info_t)); + tev.type = SREV_TCP_MSRP_FRAME; + tev.buf = tcpbuf; + tev.len = len; + tev.rcv = rcv_info; + tev.con = con; + ret = sr_event_exec(SREV_TCP_MSRP_FRAME, (void*)(&tev)); + } else { + LM_DBG("no callback registering for handling MSRP - dropping!\n"); + } + return ret; } #endif

1 0

git:master: core/tcp: support for receiving MSRP messages
by Daniel-Constantin Mierla 16 Jan '12

16 Jan '12

Module: sip-router Branch: master Commit: 122e01f35390aed08961726c18bc96dce3971234 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=122e01f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 13 12:17:24 2012 +0100 core/tcp: support for receiving MSRP messages - controlled by define READ_MSRP, on by default now, can be turned off by defininf NO_READ_MSRP --- tcp_conn.h | 17 +++++- tcp_read.c | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 178 insertions(+), 8 deletions(-) diff --git a/tcp_conn.h b/tcp_conn.h index 4328208..fe9cc00 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -80,10 +80,15 @@ #define READ_HTTP11 #endif +#ifndef NO_READ_MSRP +#define READ_MSRP +#endif + enum tcp_req_errors { TCP_REQ_INIT, TCP_REQ_OK, TCP_READ_ERROR, TCP_REQ_OVERRUN, TCP_REQ_BAD_LEN }; -enum tcp_req_states { H_SKIP_EMPTY, H_SKIP_EMPTY_CR_FOUND, H_SKIP_EMPTY_CRLF_FOUND, H_SKIP_EMPTY_CRLFCR_FOUND, - H_SKIP, H_LF, H_LFCR, H_BODY, H_STARTWS, +enum tcp_req_states { H_SKIP_EMPTY, H_SKIP_EMPTY_CR_FOUND, + H_SKIP_EMPTY_CRLF_FOUND, H_SKIP_EMPTY_CRLFCR_FOUND, + H_SKIP, H_LF, H_LFCR, H_BODY, H_STARTWS, H_CONT_LEN1, H_CONT_LEN2, H_CONT_LEN3, H_CONT_LEN4, H_CONT_LEN5, H_CONT_LEN6, H_CONT_LEN7, H_CONT_LEN8, H_CONT_LEN9, H_CONT_LEN10, H_CONT_LEN11, H_CONT_LEN12, H_CONT_LEN13, H_L_COLON, @@ -93,6 +98,9 @@ enum tcp_req_states { H_SKIP_EMPTY, H_SKIP_EMPTY_CR_FOUND, H_SKIP_EMPTY_CRLF_FOU , H_HTTP11_CHUNK_START, H_HTTP11_CHUNK_SIZE, H_HTTP11_CHUNK_BODY, H_HTTP11_CHUNK_END, H_HTTP11_CHUNK_FINISH #endif +#ifdef READ_MSRP + , H_MSRP_BODY, H_MSRP_BODY_LF, H_MSRP_BODY_END, H_MSRP_FINISH +#endif }; enum tcp_conn_states { S_CONN_ERROR=-2, S_CONN_BAD=-1, @@ -151,6 +159,11 @@ struct tcp_req{ #ifdef READ_HTTP11 #define F_TCP_REQ_BCHUNKED 4 #endif +#ifdef READ_MSRP +#define F_TCP_REQ_MSRP_NO 8 +#define F_TCP_REQ_MSRP_FRAME 16 +#define F_TCP_REQ_MSRP_BODY 32 +#endif #define TCP_REQ_HAS_CLEN(tr) ((tr)->flags & F_TCP_REQ_HAS_CLEN) #define TCP_REQ_COMPLETE(tr) ((tr)->flags & F_TCP_REQ_COMPLETE) diff --git a/tcp_read.c b/tcp_read.c index dde2f94..bdbd041 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -79,6 +79,7 @@ #include "timer.h" #include "local_timer.h" #include "ut.h" +#include "trim.h" #include "pt.h" #include "cfg/cfg_struct.h" #ifdef CORE_TLS @@ -170,6 +171,11 @@ int tcp_http11_continue(struct tcp_connection *c) msg.s = c->req.start; msg.len = c->req.pos - c->req.start; +#ifdef READ_MSRP + /* skip if MSRP message */ + if(c->req.flags&F_TCP_REQ_MSRP_FRAME) + return 0; +#endif p = parse_first_line(msg.s, msg.len, &fline); if(p==NULL) return 0; @@ -366,12 +372,17 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) int bytes, remaining; char *p; struct tcp_req* r; - + #ifdef USE_STUN unsigned int mc; /* magic cookie */ unsigned short body_len; #endif - + +#ifdef READ_MSRP + char *mfline; + str msessid; +#endif + #define crlf_default_skip_case \ case '\n': \ r->state=H_LF; \ @@ -446,6 +457,19 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) * in anything till end of line*/ p=q_memchr(p, '\n', r->pos-p); if (p){ +#ifdef READ_MSRP + /* catch if it is MSRP or not with first '\n' */ + if(!((r->flags&F_TCP_REQ_MSRP_NO) + || (r->flags&F_TCP_REQ_MSRP_FRAME))) { + if((r->pos - r->start)>5 + && strncmp(r->start, "MSRP ", 5)==0) + { + r->flags |= F_TCP_REQ_MSRP_FRAME; + } else { + r->flags |= F_TCP_REQ_MSRP_NO; + } + } +#endif p++; r->state=H_LF; }else{ @@ -476,6 +500,18 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) r->error=TCP_REQ_BAD_LEN; } break; + case '-': + r->state=H_SKIP; +#ifdef READ_MSRP + /* catch end of MSRP frame without body + * '-------sessid$\r\n' + * follows headers wihtout extra CRLF */ + if(r->flags&F_TCP_REQ_MSRP_FRAME) { + p--; + r->state=H_MSRP_BODY_END; + } +#endif + break; content_len_beg_case; default: r->state=H_SKIP; @@ -500,6 +536,20 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) } }else{ if (cfg_get(tcp, tcp_cfg, accept_no_cl)!=0) { +#ifdef READ_MSRP + /* if MSRP message */ + if(c->req.flags&F_TCP_REQ_MSRP_FRAME) + { + r->body=p+1; + /* at least 3 bytes: 0\r\n */ + r->bytes_to_go=3; + p++; + r->content_len = 0; + r->state=H_MSRP_BODY; + break; + } +#endif + #ifdef READ_HTTP11 if(TCP_REQ_BCHUNKED(r)) { r->body=p+1; @@ -851,6 +901,82 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) p++; break; #endif +#ifdef READ_MSRP + case H_MSRP_BODY: /* body of msrp frame */ + /* find lf, we are in this state if we are not interested + * in anything till end of line*/ + r->flags |= F_TCP_REQ_MSRP_BODY; + p = q_memchr(p, '\n', r->pos-p); + if (p) { + p++; + r->state=H_MSRP_BODY_LF; + } else { + p=r->pos; + } + break; + case H_MSRP_BODY_LF: /* LF in body of msrp frame */ + switch (*p) { + case '-': + p--; + r->state=H_MSRP_BODY_END; + break; + default: + r->state=H_MSRP_BODY; + } + p++; + break; + case H_MSRP_BODY_END: /* end of body for msrp frame */ + /* find LF and check if it is end-line */ + p = q_memchr(p, '\n', r->pos-p); + if (p) { + /* check if it is end line '-------sessid$\r\n' */ + if(r->pos - r->start < 10) { + LM_ERR("weird situation when reading MSRP frame" + " - continue reading\n"); + p++; + r->state=H_MSRP_BODY; + break; + } + if(*(p-1)!='\r') { + /* not ending in '\r\n' - not end-line */ + p++; + r->state=H_MSRP_BODY; + break; + } + /* locate session id in first line + * -- first line exists, that's why we are here */ + mfline = q_memchr(r->start, '\n', r->pos-r->start); + msessid.s = q_memchr(r->start + 5 /* 'MSRP ' */, ' ', + mfline - r->start); + msessid.len = msessid.s - r->start - 5; + msessid.s = r->start + 5; + trim(&msessid); + if(memcmp(msessid.s, + p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - msessid.len, + msessid.len)!=0) { + /* no match on session id - not end-line */ + p++; + r->state=H_MSRP_BODY; + break; + } + if(memcmp(p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - msessid.len + - 7 /* 7 x '-' */ - 1 /* '\n' */, "\n-------", + 8)!=0) { + /* no match on "\n-------" - not end-line */ + p++; + r->state=H_MSRP_BODY; + break; + } + r->state=H_MSRP_FINISH; + r->flags|=F_TCP_REQ_COMPLETE; + p++; + goto skip; + + } else { + p=r->pos; + } + break; +#endif default: LOG(L_CRIT, "BUG: tcp_read_headers: unexpected state %d\n", @@ -864,6 +990,15 @@ skip: } +#ifdef READ_MSRP +int msrp_process_msg(char* tcpbuf, unsigned int len, + struct receive_info* rcv_info, struct tcp_connection* con) +{ + LM_DBG("MSRP Message: [[>>>\n%.*s<<<]]\n", len, tcpbuf); + return 0; +} +#endif + /** * @brief wrapper around receive_msg() to clone the tcpbuf content * @@ -872,7 +1007,8 @@ skip: * the content of the stream. Safer, make a clone of buf content in a local * buffer and give that to receive_msg() to link to msg->buf */ -int receive_tcp_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_info) +int receive_tcp_msg(char* tcpbuf, unsigned int len, + struct receive_info* rcv_info, struct tcp_connection* con) { #ifdef TCP_CLONE_RCVBUF #ifdef DYN_BUF @@ -884,8 +1020,13 @@ int receive_tcp_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_inf int blen; /* cloning is disabled via parameter */ - if(likely(tcp_clone_rcvbuf==0)) + if(likely(tcp_clone_rcvbuf==0)) { +#ifdef READ_MSRP + if(unlikely(con->req.flags&F_TCP_REQ_MSRP_FRAME)) + return msrp_process_msg(tcpbuf, len, rcv_info, con); +#endif return receive_msg(tcpbuf, len, rcv_info); + } /* min buffer size is BUF_SIZE */ blen = len; @@ -923,8 +1064,16 @@ int receive_tcp_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_inf memcpy(buf, tcpbuf, len); buf[len] = '\0'; +#ifdef READ_MSRP + if(unlikely(con->req.flags&F_TCP_REQ_MSRP_FRAME)) + return msrp_process_msg(buf, len, rcv_info, con); +#endif return receive_msg(buf, len, rcv_info); #else /* TCP_CLONE_RCVBUF */ +#ifdef READ_MSRP + if(unlikely(con->req.flags&F_TCP_REQ_MSRP_FRAME)) + return msrp_process_msg(tcpbuf, len, rcv_info, con); +#endif return receive_msg(tcpbuf, len, rcv_info); #endif /* TCP_CLONE_RCVBUF */ } @@ -1046,17 +1195,25 @@ again: &con->rcv); }else #endif +#ifdef READ_MSRP + // if (unlikely(req->flags&F_TCP_REQ_MSRP_FRAME)){ + if (unlikely(req->state==H_MSRP_FINISH)){ + /* msrp frame */ + ret = receive_tcp_msg(req->start, req->parsed-req->start, + &con->rcv, con); + }else +#endif #ifdef READ_HTTP11 if (unlikely(req->state==H_HTTP11_CHUNK_FINISH)){ /* http chunked request */ req->body[req->content_len] = 0; ret = receive_tcp_msg(req->start, req->body + req->content_len - req->start, - &con->rcv); + &con->rcv, con); }else #endif ret = receive_tcp_msg(req->start, req->parsed-req->start, - &con->rcv); + &con->rcv, con); if (unlikely(ret < 0)) { *req->parsed=c;

1 0

git:master: core/tcp: use term from MSRP spec to name the variable
by Daniel-Constantin Mierla 16 Jan '12

16 Jan '12

Module: sip-router Branch: master Commit: eaa6473333649585c3098e00bb114d1041ff72bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eaa6473… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 14 22:12:58 2012 +0100 core/tcp: use term from MSRP spec to name the variable --- tcp_read.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index 41fbbf7..05e4d44 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -381,7 +381,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) #ifdef READ_MSRP char *mfline; - str msessid; + str mtransid; #endif #define crlf_default_skip_case \ @@ -944,23 +944,23 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) r->state=H_MSRP_BODY; break; } - /* locate session id in first line + /* locate transaction id in first line * -- first line exists, that's why we are here */ mfline = q_memchr(r->start, '\n', r->pos-r->start); - msessid.s = q_memchr(r->start + 5 /* 'MSRP ' */, ' ', + mtransid.s = q_memchr(r->start + 5 /* 'MSRP ' */, ' ', mfline - r->start); - msessid.len = msessid.s - r->start - 5; - msessid.s = r->start + 5; - trim(&msessid); - if(memcmp(msessid.s, - p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - msessid.len, - msessid.len)!=0) { + mtransid.len = mtransid.s - r->start - 5; + mtransid.s = r->start + 5; + trim(&mtransid); + if(memcmp(mtransid.s, + p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - mtransid.len, + mtransid.len)!=0) { /* no match on session id - not end-line */ p++; r->state=H_MSRP_BODY; break; } - if(memcmp(p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - msessid.len + if(memcmp(p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - mtransid.len - 7 /* 7 x '-' */ - 1 /* '\n' */, "\n-------", 8)!=0) { /* no match on "\n-------" - not end-line */

1 0

git:master: modules_k/permissions: use of str2ip6() has to be ifdef'ed.
by admin＠sip-router.org 13 Jan '12

13 Jan '12

Module: sip-router Branch: master Commit: 1e7b88508303cc84a045cc1fdd18a8e052888e9a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e7b885… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Jan 14 00:51:51 2012 +0200 modules_k/permissions: use of str2ip6() has to be ifdef'ed. --- modules_k/permissions/address.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index bdc416c..c458e9e 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -62,8 +62,12 @@ static inline ip_addr_t *strtoipX(str *ips) /* try to figure out INET class */ if(ips->s[0] == '[' || memchr(ips->s, ':', ips->len)!=NULL) { +#ifdef USE_IPV6 /* IPv6 */ return str2ip6(ips); +#else + return 0; +#endif } else { /* IPv4 */ return str2ip(ips);

1 0

new feature: per-socket number of workers
by Daniel-Constantin Mierla 13 Jan '12

13 Jan '12

Hello, the master branch has a new feature that allow setting number of worker processes to handle received traffic per listen socket. So far there were global parameters that were applied to all sockets (e.g., 'children' value set the number of workers for all udp sockets). So far each UDP and SCTP socket had its own pool of workers (e.g., children=4 and 2 udp sockets resulted in 8 processes), while for tcp and tls was a single pool of workers (e.g., having children (or tcp_children) set 8, resulted in 8 processes no matter how many tcp/tls sockets). The new features is based on using a new config parameter, named "socket_workers", before a "listen" parameter. The value of socket_workers will overwrite the value of *children parameter. For UDP and SCTP will result in creating a number of "socket_workers" processes. For TCP and TLS will add an extra set of "socket_workers" processes, that will handle traffic only on those specific sockets. The value of "socket_workers" is reset with the next listen socket added. If "socket_workers" is not set, the value of "*children" parameter is used in backward compatible fashion. Some typical scenarios where this feature may become handy: - set a lower number for loopback or internal/replication sockets, as the traffic there is low (e.g, maybe for keepalive monitoring on loopback, or it is only REGISTER requests replication done over the replication sockets) - set a dedicated group of tcp/tls workers for handling http/xmlrpc/xcap traffic - handling such traffic may be time consuming, in this way you avoid delays on routing SIP over tcp/tls - fine tune the number of over all forked processes by a SIP server instance, thus controlling better the resources used from the physical server (e.g., overall private memory used by sip server is a matter of how many forked processes are there) You can see details about the new parameter and examples on the wiki page: * http://www.kamailio.org/wiki/cookbooks/devel/core?&#socket_workers Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 0

git:master: core: option to set number of workers per listen socket
by Daniel-Constantin Mierla 12 Jan '12

12 Jan '12

Module: sip-router Branch: master Commit: edf5e385caac8b73b167dfb1604a489a6feb5bfd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=edf5e38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 12 18:55:22 2012 +0100 core: option to set number of workers per listen socket - new cfg global parameter: socket_workers - set the number of worker processes for the next listen socket - used before listen on udp and sctp socket - overwrites children/sctp_children value for that socket - used bofer listen on tcp and tls socket - adds extra tcp workers, these handling traffic only on that socket - socket_workers is reset with next listen socket that is added, thus use it for each listen socket where you want custom number of workers - if this parameter is not used at all, it is the same behaviour as so far Example for udp sockets: children=4 socket_workers=2 listen=udp:127.0.0.1:5080 listen=udp:127.0.0.1:5070 listen=udp:127.0.0.1:5060 - it will start 2 workers to handle traffic on udp:127.0.0.1:5080 and 4 for each of udp:127.0.0.1:5070 and udp:127.0.0.1:5060. In total there are 10 worker processes Example for tcp sockets: children=4 socket_workers=2 listen=tcp:127.0.0.1:5080 listen=tcp:127.0.0.1:5070 listen=tcp:127.0.0.1:5060 - it will start 2 workers to handle traffic on tcp:127.0.0.1:5080 and 4 to handle traffic on both tcp:127.0.0.1:5070 and tcp:127.0.0.1:5060. In total there are 6 worker processes --- cfg.lex | 2 + cfg.y | 5 ++- globals.h | 2 + ip_addr.h | 2 + main.c | 49 ++++++++++++++++++++------- socket_info.c | 4 ++ tcp_init.h | 1 + tcp_main.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++---------- 8 files changed, 135 insertions(+), 33 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=edf…

1 0

git:master: tmrec: new module for time recurrence matching
by Daniel-Constantin Mierla 12 Jan '12

12 Jan '12

Module: sip-router Branch: master Commit: bf692bcf4708e0c1d084bea8def9fc0d96d3f832 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf692bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 11 15:50:24 2012 +0100 tmrec: new module for time recurrence matching - recurrence definitions based on RFC2445 --- modules/tmrec/Makefile | 17 ++ modules/tmrec/README | 231 +++++++++++++++++++++++++++ modules/tmrec/doc/Makefile | 4 + modules/tmrec/doc/tmrec.xml | 37 +++++ modules/tmrec/doc/tmrec_admin.xml | 311 +++++++++++++++++++++++++++++++++++++ modules/tmrec/tmrec_mod.c | 222 ++++++++++++++++++++++++++ 6 files changed, 822 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bf6…

2 2

← Newer
1
...
9
10
11
12
13
14
15
16
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2012