sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:master: core: better condition for shifting back chunk payloads
by Daniel-Constantin Mierla 30 Aug '10

30 Aug '10

Module: sip-router Branch: master Commit: da381afeb44cbbb470c9bdc944a6169f8937e9aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da381af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 30 19:15:52 2010 +0200 core: better condition for shifting back chunk payloads --- tcp_read.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index c71949b..e152f5b 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -744,7 +744,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) if (r->bytes_to_go==0){ r->state = H_HTTP11_CHUNK_END; /* shift back body content */ - if(p-r->chunk_size>0) { + if(r->chunk_size>0 && p-r->chunk_size>r->body) { memcpy(r->body + r->content_len, p - r->chunk_size, r->chunk_size); r->content_len += r->chunk_size;

1 0

git:carstenbock/rtpproxy: - Updated the patch to the latest changes ( see previous commit)
by Carsten Bock 30 Aug '10

30 Aug '10

Module: sip-router Branch: carstenbock/rtpproxy Commit: d0f8a3f7f69087969ca01f254cbdbcbfb2cececa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0f8a3f… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Mon Aug 30 17:17:13 2010 +0200 - Updated the patch to the latest changes (see previous commit) - removed pre-built rtpproxy --- modules_k/rtpproxy/test/rtpproxy.patch | 167 +++++++++++++++++++++++-------- modules_k/rtpproxy/test/rtpproxy.tar.gz | Bin 1095581 -> 0 bytes 2 files changed, 126 insertions(+), 41 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d0f…

1 0

git:carstenbock/rtpproxy: Add a parameter for the type of the RTP-Timeout-Socket ( defaults to 1 for Kamailio-XMLRPC)
by Carsten Bock 30 Aug '10

30 Aug '10

Module: sip-router Branch: carstenbock/rtpproxy Commit: 7264d5c4ad8c25f8e63ecf2a21af9d6519c778f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7264d5c… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Mon Aug 30 16:48:49 2010 +0200 Add a parameter for the type of the RTP-Timeout-Socket (defaults to 1 for Kamailio-XMLRPC) --- modules_k/rtpproxy/doc/rtpproxy_admin.xml | 28 ++++++++++++++++++++++++++- modules_k/rtpproxy/rtpproxy.c | 30 ++++++++++++++++++---------- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/modules_k/rtpproxy/doc/rtpproxy_admin.xml b/modules_k/rtpproxy/doc/rtpproxy_admin.xml index f23bc58..0074b6d 100644 --- a/modules_k/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules_k/rtpproxy/doc/rtpproxy_admin.xml @@ -231,7 +231,6 @@ modparam("rtpproxy", "nortpproxy_str", "a=sdpmangled:yes\r\n") </programlisting> </example> </section> - </section> <section> <title><varname>timeout_socket</varname> (string)</title> <para> @@ -254,6 +253,33 @@ modparam("nathelper", "timeout_socket", "http://127.0.0.1:8000/RPC2") </programlisting> </example> </section> + <section> + <title><varname>timeout_socket_type</varname> (int)</title> + <para> + The parameter sets type of the timeout socket, which is transmitted to the RTP-Proxy. + </para> + <para> + If it is not set, type 1 (Kamailio XML-RPC-Socket) is transmitted to the RTP-Proxy. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>timeout_socket_type</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "timeout_socket_type", 42) +... +</programlisting> + </example> + <para> + <emphasis> + The only supported Type on the RTP-Proxy is currently <quote>1</quote> or <quote>0</quote> which is the default socket-type of the RTP-Proxy which is not compatible to Kamailio. + </emphasis> + </para> + </section> </section> <section> diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index f34a1e7..f526581 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -341,6 +341,7 @@ static int *rtpp_socks = 0; unsigned int *natping_state=0; static str timeout_socket_str = {0, 0}; +static int timeout_socket_type = 1; static cmd_export_t cmds[] = { {"set_rtp_proxy_set", (cmd_function)set_rtp_proxy_set_f, 1, @@ -408,6 +409,7 @@ static param_export_t params[] = { {"rtpproxy_retr", INT_PARAM, &rtpproxy_retr }, {"rtpproxy_tout", INT_PARAM, &rtpproxy_tout }, {"timeout_socket", STR_PARAM, &timeout_socket_str.s }, + {"timeout_socket_type", INT_PARAM, &timeout_socket_type }, {0, 0, 0} }; @@ -1816,14 +1818,16 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) {";", 1}, /* separator */ {NULL, 0}, /* medianum */ {" ", 1}, /* separator */ + {NULL, 0}, /* Type of timeout-socket: 1 Kamailio-XML-RPC */ + {" ", 1}, /* separator */ {NULL, 0}, /* Timeout-Socket */ }; int iovec_param_count; char *c1p, *c2p, *bodylimit, *o1p; - char medianum_buf[20]; + char itoabuf_buf[20]; int medianum, media_multi; - str medianum_str; + str itoabuf_str; int c1p_altered; static int swap_warned = 0; @@ -2102,14 +2106,14 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) #endif if (1 || media_multi) /* XXX netch: can't choose now*/ { - snprintf(medianum_buf, sizeof medianum_buf, "%d", medianum); - medianum_str.s = medianum_buf; - medianum_str.len = strlen(medianum_buf); - STR2IOVEC(medianum_str, v[13]); - STR2IOVEC(medianum_str, v[17]); + snprintf(itoabuf_buf, sizeof itoabuf_buf, "%d", medianum); + itoabuf_str.s = itoabuf_buf; + itoabuf_str.len = strlen(itoabuf_buf); + STR2IOVEC(itoabuf_str, v[13]); + STR2IOVEC(itoabuf_str, v[17]); #ifdef EXTRA_DEBUG - LM_DBG("STR2IOVEC(medianum_str, v[13])\n"); - LM_DBG("STR2IOVEC(medianum_str, v[17])\n"); + LM_DBG("STR2IOVEC(itoabuf_str, v[13])\n"); + LM_DBG("STR2IOVEC(itoabuf_str, v[17])\n"); #endif } else { v[12].iov_len = v[13].iov_len = 0; @@ -2174,8 +2178,12 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) if (to_tag.len > 0) { iovec_param_count = 18; if (timeout_socket_str.len > 0) { - iovec_param_count = 20; - STR2IOVEC(timeout_socket_str, v[19]); + iovec_param_count = 22; + snprintf(itoabuf_buf, sizeof itoabuf_buf, "%d", timeout_socket_type); + itoabuf_str.s = itoabuf_buf; + itoabuf_str.len = strlen(itoabuf_buf); + STR2IOVEC(itoabuf_str, v[19]); + STR2IOVEC(timeout_socket_str, v[21]); } } else { iovec_param_count = 14;

1 0

git:carstenbock/rtpproxy: Merge branch 'master' into rtpproxy
by Carsten Bock 30 Aug '10

30 Aug '10

Module: sip-router Branch: carstenbock/rtpproxy Commit: 00de0df1c66f4fc3183062fa50015a7ef2037694 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00de0df… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Tue Aug 24 11:10:41 2010 +0200 Merge branch 'master' into rtpproxy * master: core: daemon status/pipe fixes & interface changes ---

1 0

git:master: modules/ db_berkeley Added a compatibility layer between libdb versions smaller than 4 .6 and libdb4.6
by Marius Zbihlei 30 Aug '10

30 Aug '10

Module: sip-router Branch: master Commit: 9d8d30c691fbd779ccf68c5f0f12cef17792934d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d8d30c… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Aug 30 17:19:17 2010 +0300 modules/db_berkeley Added a compatibility layer between libdb versions smaller than 4.6 and libdb4.6 Cursor method close() is not present in versions smaller than 4.6 thus the module would not compile. Also c_* methods are marked as deprecated so the compatibility layer should be extended as well. --- modules/db_berkeley/bdb_cmd.c | 3 +- modules/db_berkeley/bdb_crs_compat.h | 43 ++++++++++++++++++++++++++++++++++ modules/db_berkeley/bdb_res.c | 3 +- modules/db_berkeley/km_db_berkeley.c | 9 ++++--- 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/modules/db_berkeley/bdb_cmd.c b/modules/db_berkeley/bdb_cmd.c index 64b46c3..8396690 100644 --- a/modules/db_berkeley/bdb_cmd.c +++ b/modules/db_berkeley/bdb_cmd.c @@ -44,6 +44,7 @@ #include "bdb_uri.h" #include "bdb_res.h" #include "bdb_lib.h" +#include "bdb_crs_compat.h" #define BDB_BUF_SIZE 1024 @@ -56,7 +57,7 @@ static void bdb_cmd_free(db_cmd_t* cmd, bdb_cmd_t* payload) { db_drv_free(&payload->gen); if (payload->dbcp) - payload->dbcp->c_close(payload->dbcp); + payload->dbcp->CLOSE_CURSOR(payload->dbcp); if(payload->skey.s) pkg_free(payload->skey.s); pkg_free(payload); diff --git a/modules/db_berkeley/bdb_crs_compat.h b/modules/db_berkeley/bdb_crs_compat.h new file mode 100644 index 0000000..5d2d558 --- /dev/null +++ b/modules/db_berkeley/bdb_crs_compat.h @@ -0,0 +1,43 @@ +/* + * $Id$ + * + * BDB Compatibility layer for SIP-router + * + * Copyright (C) 2010 Marius Zbihlei marius.zbihlei at 1and1 dot ro + * + * This file is part of SIP-router, a free SIP server. + * + * SIP-router 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. + * + * SIP-router 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 BDB_CRS_COMPAT_H +#define BDB_CRS_COMPAT_H + +#include <db.h> + +/* this is a compatibility layer for cursor close function + * Historically, the function was called c_close() but it became deprecated + * starting with version 4.6 + */ +#if DB_VERSION_MAJOR < 4 +# define CLOSE_CURSOR c_close +#else +#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR < 6) +# define CLOSE_CURSOR c_close +#else +# define CLOSE_CURSOR close +#endif +#endif + +#endif //BDB_CRS_COMPAT_H \ No newline at end of file diff --git a/modules/db_berkeley/bdb_res.c b/modules/db_berkeley/bdb_res.c index 75bd856..1b73335 100644 --- a/modules/db_berkeley/bdb_res.c +++ b/modules/db_berkeley/bdb_res.c @@ -32,6 +32,7 @@ #include "bdb_res.h" #include "bdb_cmd.h" +#include "bdb_crs_compat.h" #include "../../mem/mem.h" #include "../../dprint.h" @@ -48,7 +49,7 @@ void bdb_res_free(db_res_t* res, bdb_res_t *payload) if(bcmd->dbcp!=NULL) { - bcmd->dbcp->close(bcmd->dbcp); + bcmd->dbcp->CLOSE_CURSOR(bcmd->dbcp); bcmd->dbcp = NULL; } db_drv_free(&payload->gen); diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index 9bab9d2..daeaca6 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -51,6 +51,7 @@ #include "km_bdb_res.h" #include "km_bdb_mi.h" #include "bdb_mod.h" +#include "bdb_crs_compat.h" #ifndef CFG_DIR #define CFG_DIR "/tmp" @@ -457,7 +458,7 @@ int km_bdb_query(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, i++; } - dbcp->c_close(dbcp); + dbcp->CLOSE_CURSOR(dbcp); ret=0; #ifdef BDB_EXTRA_DEBUG @@ -520,7 +521,7 @@ int km_bdb_query(db1_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, i++; } - dbcp->c_close(dbcp); + dbcp->CLOSE_CURSOR(dbcp); BDB_CON_RESULT(_con) = *_r; return 0; } @@ -834,7 +835,7 @@ int bdb_delete(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int _n) ret = dbcp->c_del(dbcp, 0); } - dbcp->c_close(dbcp); + dbcp->CLOSE_CURSOR(dbcp); return 0; } @@ -1006,7 +1007,7 @@ int _bdb_delete_cursor(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, error: if(dbcp) - dbcp->c_close(dbcp); + dbcp->CLOSE_CURSOR(dbcp); if(_r) db_free_result(_r); if(lkey)

1 0

git:master: xcap_server: etag column is of type str
by Daniel-Constantin Mierla 30 Aug '10

30 Aug '10

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");

1 0

git:master: tcp: read http/1.1 chunked body
by Daniel-Constantin Mierla 30 Aug '10

30 Aug '10

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);

1 0

git:master: pv(k): don't use CL for body PV
by Daniel-Constantin Mierla 30 Aug '10

30 Aug '10

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); }

1 0

git:master: xhttp: don't set version to http/1.0
by Daniel-Constantin Mierla 30 Aug '10

30 Aug '10

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];

1 0

[tracker] Comment added: dialplan reload, out of memory
by sip-router 28 Aug '10

28 Aug '10

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.

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010