stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

patch: SIP tcp receive; startline max 8192, TCP reasm buffer max 64K

Browse source
This commit is contained in:
Alfred E. Heggestad 2012-01-15 14:58:41 +00:00
parent 2f70e0cef3
commit 6e4aa8b3f4
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/sip/msg.c
View file

@ -20,6 +20,7 @@
enum {
HDR_HASH_SIZE = 32,
STARTLINE_MAX = 8192,
};
@ -266,7 +267,7 @@ int sip_msg_decode(struct sip_msg **msgp, struct mbuf *mb)
if (re_regex(p, l, "[^ \t\r\n]+ [^ \t\r\n]+ [^\r\n]*[\r]*[\n]1",
&x, &y, &z, NULL, &e) || x.p != (char *)mbuf_buf(mb))
return EBADMSG;
return (l > STARTLINE_MAX) ? EBADMSG : ENODATA;
msg = mem_zalloc(sizeof(*msg), destructor);
if (!msg)

8
src/sip/transp.c
View file

@ -26,6 +26,7 @@ enum {
TCP_ACCEPT_TIMEOUT = 32,
TCP_KEEPALIVE_TIMEOUT = 10,
TCP_KEEPALIVE_INTVAL = 120,
TCP_BUFSIZE_MAX = 65536,
};
@ -339,6 +340,11 @@ static void tcp_recv_handler(struct mbuf *mb, void *arg)
goto out;
conn->mb->pos = pos;
if (mbuf_get_left(conn->mb) > TCP_BUFSIZE_MAX) {
err = EOVERFLOW;
goto out;
}
}
else {
conn->mb = mem_ref(mb);
@ -414,7 +420,7 @@ static void tcp_recv_handler(struct mbuf *mb, void *arg)
sip_recv(conn->sip, msg);
mem_deref(msg);
if (end == conn->mb->end) {
if (end <= conn->mb->end) {
conn->mb = mem_deref(conn->mb);
break;
}