opensource/nginx-rtmp-module
1
0
Fork 0
mirror of https://github.com/arut/nginx-rtmp-module.git synced 2025-08-06 15:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed bugs in packet input

Browse Source
This commit is contained in:
Roman Arutyunyan
2012-03-15 15:49:05 +04:00
parent 78ea1b1266
commit 17a3d368d8
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ngx_rtmp_handler.c
View File

@ -360,6 +360,7 @@ ngx_rtmp_handshake_send(ngx_event_t *wev)
ngx_rtmp_core_srv_conf_t *cscf;
ngx_buf_t *b;
size_t offs;
static u_char zeroes[4];
c = wev->data;
s = c->data;
@ -394,6 +395,9 @@ restart:
/* use the timestamp from echo packet */
n = c->send(c, b->pos + 4, 4 - (b->pos - b->start));
} else if (b->pos - b->start < 8) {
n = c->send(c, zeroes, 8 - (b->pos - b->start));
} else {
offs = (b->pos - b->start - 4) % sizeof(handshake_text);
n = c->send(c, (u_char*)handshake_text + offs,
@ -659,8 +663,8 @@ ngx_rtmp_recv(ngx_event_t *rev)
if (fsize > s->in_chunk_size) {
/* collect fragmented chunks */
st->len += s->in_chunk_size;
old_pos = b->pos + s->in_chunk_size;
b->last = b->pos + s->in_chunk_size;
old_pos = b->last;
old_size = size - s->in_chunk_size;
} else {
@ -747,6 +751,7 @@ ngx_rtmp_send(ngx_event_t *wev)
l = s->out;
if (l->buf->pos < l->buf->last) {
l->buf->pos = l->buf->last;
break;
}