sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: xhttp: don't set version to http/1.0

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c16594981087248996381e132e637504a0cac8ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c165949… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 30 10:40:33 2010 +0200 xhttp: don't set version to http/1.0 - allow http/1.1 in replies --- modules/xhttp/xhttp_mod.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/xhttp/xhttp_mod.c b/modules/xhttp/xhttp_mod.c index 39c168d..48ea2be 100644 --- a/modules/xhttp/xhttp_mod.c +++ b/modules/xhttp/xhttp_mod.c @@ -292,8 +292,6 @@ static int xhttp_handler(sip_msg_t* msg) return NONSIP_MSG_PASS; } - /* we support HTTP/1.0 - fix it for replies */ - msg->first_line.u.request.version.s[HTTP_VERSION_LEN] = '0'; if(xhttp_url_match!=NULL) { c = msg->first_line.u.request.uri.s[msg->first_line.u.request.uri.len];

14 years, 5 months

git:master: pv(k): don't use CL for body PV

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a82617e71dd4c5f5f928c16b054c605980a74ebe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a82617e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 30 10:33:34 2010 +0200 pv(k): don't use CL for body PV - size of body is computed from size of sip message --- modules_k/pv/pv_core.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index b69df2a..9328e52 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -945,23 +945,18 @@ int pv_get_msg_body(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; - if(msg==NULL) + if(msg==NULL) return -1; - + s.s = get_body( msg ); - if (s.s == NULL) + if(s.s == NULL) { LM_DBG("no message body\n"); return pv_get_null(msg, param, res); - } + } + s.len = msg->buf + msg->len - s.s; - if (!msg->content_length) - { - LM_ERR("no Content-Length header found\n"); - return pv_get_null(msg, param, res); - } - s.len = get_content_length(msg); return pv_get_strval(msg, param, res, &s); }

14 years, 5 months

git:master: tcp: read http/1.1 chunked body

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b4fbd9f5c164099142c4301660e78a3db63f267c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4fbd9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 30 10:35:46 2010 +0200 tcp: read http/1.1 chunked body - fix for xcap_server module that has to deal with PUT commands from xcap clients - code withing READ_HTTP11 defines (for now off by default) - conditioned by tcp_accept_no_cl=yes - able to handle cases of "Expect: 100-continue" and "Transfer-Encoding: chunked" --- tcp_conn.h | 13 +++++ tcp_read.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 167 insertions(+), 3 deletions(-) diff --git a/tcp_conn.h b/tcp_conn.h index 3ce6084..b729df7 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -86,6 +86,10 @@ enum tcp_req_states { H_SKIP_EMPTY, H_SKIP_EMPTY_CR_FOUND, H_SKIP_EMPTY_CRLF_FOU H_CONT_LEN11, H_CONT_LEN12, H_CONT_LEN13, H_L_COLON, H_CONT_LEN_BODY, H_CONT_LEN_BODY_PARSE, H_STUN_MSG, H_STUN_READ_BODY, H_STUN_FP, H_STUN_END, H_PING_CRLF +#ifdef READ_HTTP11 + , H_HTTP11_CHUNK_START, H_HTTP11_CHUNK_SIZE, + H_HTTP11_CHUNK_BODY, H_HTTP11_CHUNK_END, H_HTTP11_CHUNK_FINISH +#endif }; enum tcp_conn_states { S_CONN_ERROR=-2, S_CONN_BAD=-1, @@ -129,6 +133,9 @@ struct tcp_req{ char* body; /* body position */ unsigned int b_size; /* buffer size-1 (extra space for 0-term)*/ int content_len; +#ifdef READ_HTTP11 + int chunk_size; +#endif unsigned short flags; /* F_TCP_REQ_HAS_CLEN | F_TCP_REQ_COMPLETE */ int bytes_to_go; /* how many bytes we have still to read from the body*/ enum tcp_req_errors error; @@ -138,9 +145,15 @@ struct tcp_req{ /* tcp_req flags */ #define F_TCP_REQ_HAS_CLEN 1 #define F_TCP_REQ_COMPLETE 2 +#ifdef READ_HTTP11 +#define F_TCP_REQ_BCHUNKED 4 +#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) +#ifdef READ_HTTP11 +#define TCP_REQ_BCHUNKED(tr) ((tr)->flags & F_TCP_REQ_BCHUNKED) +#endif struct tcp_connection; diff --git a/tcp_read.c b/tcp_read.c index a4c1461..c71949b 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -103,6 +103,11 @@ int is_msg_complete(struct tcp_req* r); #endif /* USE_STUN */ +#ifdef READ_HTTP11 +#define HTTP11CONTINUE "HTTP/1.1 100 Continue\r\nContent-Lenght: 0\r\n\r\n" +#define HTTP11CONTINUE_LEN (sizeof(HTTP11CONTINUE)-1) +#endif + #define TCPCONN_TIMEOUT_MIN_RUN 1 /* run the timers each new tick */ /* types used in io_wait* */ @@ -116,6 +121,47 @@ static int tcpmain_sock=-1; static struct local_timer tcp_reader_ltimer; static ticks_t tcp_reader_prev_ticks; +#ifdef READ_HTTP11 +int tcp_http11_continue(struct tcp_connection *c) +{ + struct dest_info dst; + char *p; + struct msg_start fline; + int ret; + + ret = 0; + + p = parse_first_line(c->req.buf, c->req.pos - c->req.buf, &fline); + if(p==NULL) + return 0; + + if(fline.type!=SIP_REQUEST) + return 0; + + /* check if http request */ + if(fline.u.request.version.len < HTTP_VERSION_LEN + || strncasecmp(fline.u.request.version.s, + HTTP_VERSION, HTTP_VERSION_LEN)) + return 0; + + /* check for Expect header */ + if(strstr(c->req.buf, "Expect: 100-continue")!=NULL) + { + init_dst_from_rcv(&dst, &c->rcv); + if (tcp_send(&dst, 0, HTTP11CONTINUE, HTTP11CONTINUE_LEN) < 0) { + LOG(L_ERR, "HTTP/1.1 continue failed\n"); + } + } + /* check for Transfer-Encoding header */ + if(strstr(c->req.buf, "Transfer-Encoding: chunked")!=NULL) + { + c->req.flags |= F_TCP_REQ_BCHUNKED; + ret = 1; + } + return ret; +} +#endif /* HTTP11 */ + /** reads data from an existing tcp connection. * Side-effects: blacklisting, sets connection state to S_CONN_OK, tcp stats. @@ -400,6 +446,10 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) if (*p=='\n'){ /* found LF CR LF */ r->state=H_BODY; +#ifdef READ_HTTP11 + if (cfg_get(tcp, tcp_cfg, accept_no_cl)!=0) + tcp_http11_continue(c); +#endif if (TCP_REQ_HAS_CLEN(r)){ r->body=p+1; r->bytes_to_go=r->content_len; @@ -410,6 +460,17 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) } }else{ if (cfg_get(tcp, tcp_cfg, accept_no_cl)!=0) { +#ifdef READ_HTTP11 + if(TCP_REQ_BCHUNKED(r)) { + r->body=p+1; + /* at least 3 bytes: 0\r\n */ + r->bytes_to_go=3; + p++; + r->content_len = 0; + r->state=H_HTTP11_CHUNK_START; + break; + } +#endif r->body=p+1; r->bytes_to_go=0; r->flags|=F_TCP_REQ_COMPLETE; @@ -598,7 +659,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) change_state_case(H_CONT_LEN11, 'G', 'g', H_CONT_LEN12); change_state_case(H_CONT_LEN12, 'T', 't', H_CONT_LEN13); change_state_case(H_CONT_LEN13, 'H', 'h', H_L_COLON); - + case H_L_COLON: switch(*p){ case ' ': @@ -611,7 +672,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) }; p++; break; - + case H_CONT_LEN_BODY: switch(*p){ case ' ': @@ -635,7 +696,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) } p++; break; - + case H_CONT_LEN_BODY_PARSE: switch(*p){ case '0': @@ -670,6 +731,87 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) p++; break; +#ifdef READ_HTTP11 + case H_HTTP11_CHUNK_START: /* start a new body chunk: SIZE\r\nBODY\r\n */ + r->chunk_size = 0; + r->state = H_HTTP11_CHUNK_SIZE; + break; + case H_HTTP11_CHUNK_BODY: /* content of chunnk */ + remaining=r->pos-p; + if (remaining>r->bytes_to_go) remaining=r->bytes_to_go; + r->bytes_to_go-=remaining; + p+=remaining; + if (r->bytes_to_go==0){ + r->state = H_HTTP11_CHUNK_END; + /* shift back body content */ + if(p-r->chunk_size>0) { + memcpy(r->body + r->content_len, p - r->chunk_size, + r->chunk_size); + r->content_len += r->chunk_size; + } + goto skip; + } + break; + + case H_HTTP11_CHUNK_END: + switch(*p){ + case '\r': + case ' ': + case '\t': /* skip */ + break; + case '\n': + r->state = H_HTTP11_CHUNK_START; + break; + default: + LM_ERR("bad chunk, unexpected " + "char %c in state %d\n", *p, r->state); + r->state=H_SKIP; /* try to find another?*/ + } + p++; + break; + + case H_HTTP11_CHUNK_SIZE: + switch(*p){ + case '0': case '1': case '2': case '3': + case '4': case '5': case '6': case '7': + case '8': case '9': + r->chunk_size <<= 4; + r->chunk_size += *p - '0'; + break; + case 'a': case 'b': case 'c': case 'd': + case 'e': case 'f': + r->chunk_size <<= 4; + r->chunk_size += *p - 'a' + 10; + break; + case 'A': case 'B': case 'C': case 'D': + case 'E': case 'F': + r->chunk_size <<= 4; + r->chunk_size += *p - 'A' + 10; + break; + case '\r': + case ' ': + case '\t': /* skip */ + break; + case '\n': + /* end of line, parse successful */ + r->state=H_HTTP11_CHUNK_BODY; + r->bytes_to_go = r->chunk_size; + if (r->bytes_to_go==0){ + r->state=H_HTTP11_CHUNK_FINISH; + r->flags|=F_TCP_REQ_COMPLETE; + p++; + goto skip; + } + break; + default: + LM_ERR("bad chunk size value, unexpected " + "char %c in state %d\n", *p, r->state); + r->state=H_SKIP; /* try to find another?*/ + } + p++; + break; +#endif + default: LOG(L_CRIT, "BUG: tcp_read_headers: unexpected state %d\n", r->state); @@ -801,6 +943,15 @@ again: &con->rcv); }else #endif +#ifdef READ_HTTP11 + if (unlikely(req->state==H_HTTP11_CHUNK_FINISH)){ + /* http chunked request */ + req->body[req->content_len] = 0; + ret = receive_msg(req->start, + req->body + req->content_len - req->start, + &con->rcv); + }else +#endif ret = receive_msg(req->start, req->parsed-req->start, &con->rcv);

14 years, 5 months

git:master: xcap_server: etag column is of type str

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 928c92dbaecf1157445155dd6278f8479da777b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=928c92d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 30 10:34:43 2010 +0200 xcap_server: etag column is of type str --- modules_k/xcap_server/xcap_server.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index 07c2a36..f78afa1 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -305,7 +305,7 @@ static int xcaps_put_db(str* user, str *domain, str* path, str *etag, ncols++; qcols[ncols] = &str_etag_col; - qvals[ncols].type = DB1_STRING; + qvals[ncols].type = DB1_STR; qvals[ncols].nul = 0; qvals[ncols].val.str_val= *etag; ncols++; @@ -431,7 +431,7 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath, goto error; } etag.s = etag_hdr.s + 10; /* 'SIP-ETag: ' */ - etag.len = etag_hdr.len - 12; + etag.len = etag_hdr.len - 12; /* 'SIP-ETag: ' '\r\n' */ if(xcaps_put_db(&turi.user, &turi.host, &path, &etag, dtype, &body)<0) { LM_ERR("could not store document\n");

14 years, 5 months

[tracker] Comment added: dialplan reload, out of memory

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#86 - dialplan reload, out of memory User who did this - Juha Heinanen (jh) ---------- kim, did you read dialplan README? if so, didn't adjusting fetch_rows help? -- juha ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=86#comment115 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

git:master: registrar(k): declare variables at function start

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 1a8ce8fdc91f1708057430bcbe07b5edb656591a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a8ce8f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:51:41 2010 +0200 registrar(k): declare variables at function start Fixes compilation with gcc < 3.0. --- modules_k/registrar/reg_mod.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/reg_mod.c b/modules_k/registrar/reg_mod.c index 10e4362..239447e 100644 --- a/modules_k/registrar/reg_mod.c +++ b/modules_k/registrar/reg_mod.c @@ -241,6 +241,7 @@ static int mod_init(void) pv_spec_t avp_spec; str s; bind_usrloc_t bind_usrloc; + qvalue_t dq; #ifdef STATISTICS @@ -326,7 +327,7 @@ static int mod_init(void) } /* Normalize default_q parameter */ - qvalue_t dq = cfg_get(registrar, registrar_cfg, default_q); + dq = cfg_get(registrar, registrar_cfg, default_q); if ( dq!= Q_UNSPECIFIED) { if (dq > MAX_Q) { LM_DBG("default_q = %d, lowering to MAX_Q: %d\n", dq, MAX_Q);

14 years, 5 months

git:master: textops(k): declare variables at function start

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ba63bfee9c4406d4694e886cf2d0236e8a3cc893 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba63bfe… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:52:24 2010 +0200 textops(k): declare variables at function start Fixes compilation with gcc < 3.0. --- modules_k/textops/api.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules_k/textops/api.c b/modules_k/textops/api.c index f2bd094..aad62e1 100644 --- a/modules_k/textops/api.c +++ b/modules_k/textops/api.c @@ -53,12 +53,14 @@ int remove_hf_api(struct sip_msg *msg, str* str_hf){ int search_append_api(struct sip_msg *msg, str *regex, str *data_str){ int retval; + char *data; + void **param; - char *data=pkg_malloc(data_str->len+1); + data=pkg_malloc(data_str->len+1); memcpy(data,data_str->s,data_str->len); memset(data+data_str->len,0,1); - void **param=pkg_malloc(sizeof(void*)); + param=pkg_malloc(sizeof(void*)); *param=pkg_malloc(regex->len+1); memcpy(*param,regex->s,regex->len); memset(*param+regex->len,0,1);

14 years, 5 months

git:master: dialog(k): declare variables at function start

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 361ab5c90f2a8750bf58eb2921b8a40294dbfa80 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=361ab5c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:50:59 2010 +0200 dialog(k): declare variables at function start Fixes compilation for gcc < 3.0. --- modules_k/dialog/dlg_req_within.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_k/dialog/dlg_req_within.c b/modules_k/dialog/dlg_req_within.c index 7d50926..36e3012 100644 --- a/modules_k/dialog/dlg_req_within.c +++ b/modules_k/dialog/dlg_req_within.c @@ -237,6 +237,10 @@ error: */ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) { + uac_req_t uac_r; + dlg_t* dialog_info; + str met = {"BYE", 3}; + int result; /* do not send BYE request for non-confirmed dialogs (not supported) */ if (cell->state != DLG_STATE_CONFIRMED_NA && cell->state != DLG_STATE_CONFIRMED) { LM_ERR("terminating non-confirmed dialogs not supported\n"); @@ -244,10 +248,6 @@ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) } /*verify direction*/ - uac_req_t uac_r; - dlg_t* dialog_info; - str met = {"BYE", 3}; - int result; if ((dialog_info = build_dlg_t(cell, dir)) == 0){ LM_ERR("failed to create dlg_t\n");

14 years, 5 months

git:master: mediaproxy: declare variables at function start

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 84482678115bfaf3815c03f55376e553f77dafb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8448267… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:49:58 2010 +0200 mediaproxy: declare variables at function start Fixes compilation with gcc < 3.0. --- modules/mediaproxy/mediaproxy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index 855fb7d..b195123 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -1568,6 +1568,7 @@ use_media_proxy(struct sip_msg *msg, char *dialog_id, ice_candidate_data *ice_da Bool removed_session_ip, have_sdp; SessionInfo session; StreamInfo stream; + unsigned int priority; if (msg == NULL) return -1; @@ -1807,7 +1808,7 @@ use_media_proxy(struct sip_msg *msg, char *dialog_id, ice_candidate_data *ice_da struct in_addr hexip; inet_aton(tokens[0].s, &hexip); - unsigned int priority = (ice_data == NULL)?get_ice_candidate_priority(priority_str):ice_data->priority; + priority = (ice_data == NULL)?get_ice_candidate_priority(priority_str):ice_data->priority; port = strtoint(&tokens[j]); candidate.s = buf; candidate.len = sprintf(candidate.s, "a=candidate:R%x 1 UDP %u %.*s %i typ relay%.*s",

14 years, 5 months

git:master: mtree: declare variables at function start

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 96262b5a05d8f130c6460a8bd97555bc53278f55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96262b5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:47:56 2010 +0200 mtree: declare variables at function start Fixes compilation for gcc < 3.0. --- modules/mtree/mtree.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index 51d355a..a1626d2 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -597,11 +597,12 @@ int mt_table_spec(char* val) param_t* params_list = NULL; param_hooks_t phooks; param_t *pit=NULL; - if(val==NULL) - return -1; m_tree_t tmp; m_tree_t *it, *prev, *ndl; str s; + + if(val==NULL) + return -1; if(!shm_initialized()) {

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev