zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-10 14:31:07 +02:00
Code Issues Projects Releases Wiki Activity

changed char* to ngx_str_t in AMF declarations

Browse source
This commit is contained in:
Roman Arutyunyan 2012-03-29 16:51:17 +04:00
parent 38c7cf3137
commit a1ee083e25
4 changed files with 98 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ngx_rtmp_amf.c
View file

@ -170,14 +170,14 @@ ngx_rtmp_amf_read_object(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
maxlen = 0;
for(n = 0; n < nelts; ++n) {
namelen = strlen(elts[n].name);
namelen = elts[n].name.len;
if (namelen > maxlen)
maxlen = namelen;
}
for(;;) {
char name[maxlen + 1];
char name[maxlen];
/* read key */
if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK)
@ -190,13 +190,11 @@ ngx_rtmp_amf_read_object(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
if (len <= maxlen) {
rc = ngx_rtmp_amf_get(ctx, name, len);
name[len] = 0;
} else {
rc = ngx_rtmp_amf_get(ctx, name, maxlen);
if (rc != NGX_OK)
return NGX_ERROR;
name[maxlen] = 0;
rc = ngx_rtmp_amf_get(ctx, 0, len - maxlen);
}
@ -205,7 +203,10 @@ ngx_rtmp_amf_read_object(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
/* TODO: if we require array to be sorted on name
* then we could be able to use binary search */
for(n = 0; n < nelts && strcmp(name, elts[n].name); ++n);
for(n = 0; n < nelts
&& (len != elts[n].name.len
|| ngx_strncmp(name, elts[n].name.data, len));
++n);
if (ngx_rtmp_amf_read(ctx, n < nelts ? &elts[n] : NULL, 1) != NGX_OK)
return NGX_ERROR;
@ -353,15 +354,13 @@ static ngx_int_t
ngx_rtmp_amf_write_object(ngx_rtmp_amf_ctx_t *ctx,
ngx_rtmp_amf_elt_t *elts, size_t nelts)
{
uint16_t len, len_sb;
uint16_t len;
size_t n;
char *name;
u_char buf[2];
for(n = 0; n < nelts; ++n) {
name = elts[n].name;
len_sb = len = strlen(name);
len = elts[n].name.len;
if (ngx_rtmp_amf_put(ctx,
ngx_rtmp_amf_reverse_copy(buf,
@ -370,7 +369,7 @@ ngx_rtmp_amf_write_object(ngx_rtmp_amf_ctx_t *ctx,
return NGX_ERROR;
}
if (ngx_rtmp_amf_put(ctx, name, len) != NGX_OK) {
if (ngx_rtmp_amf_put(ctx, elts[n].name.data, len) != NGX_OK) {
return NGX_ERROR;
}
@ -379,9 +378,7 @@ ngx_rtmp_amf_write_object(ngx_rtmp_amf_ctx_t *ctx,
}
}
len = 0;
if (ngx_rtmp_amf_put(ctx, "\00\00", 2) != NGX_OK) {
if (ngx_rtmp_amf_put(ctx, "\0\0", 2) != NGX_OK) {
return NGX_ERROR;
}

2
ngx_rtmp_amf.h
View file

@ -26,7 +26,7 @@
typedef struct {
ngx_int_t type;
char *name;
ngx_str_t name;
void *data;
size_t len;
} ngx_rtmp_amf_elt_t;

164
ngx_rtmp_cmd_module.c
View file

@ -66,41 +66,43 @@ ngx_rtmp_cmd_connect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
static ngx_rtmp_amf_elt_t in_cmd[] = {
{ NGX_RTMP_AMF_STRING,
"app",
ngx_string("app"),
v.app, sizeof(v.app) },
{ NGX_RTMP_AMF_STRING,
"flashver",
ngx_string("flashver"),
v.flashver, sizeof(v.flashver) },
{ NGX_RTMP_AMF_STRING,
"swfUrl",
ngx_string("swfUrl"),
v.swf_url, sizeof(v.swf_url) },
{ NGX_RTMP_AMF_STRING,
"tcUrl",
ngx_string("tcUrl"),
v.tc_url, sizeof(v.tc_url) },
{ NGX_RTMP_AMF_NUMBER,
"audioCodecs",
ngx_string("audioCodecs"),
&v.acodecs, sizeof(v.acodecs) },
{ NGX_RTMP_AMF_NUMBER,
"videoCodecs",
ngx_string("videoCodecs"),
&v.vcodecs, sizeof(v.vcodecs) },
{ NGX_RTMP_AMF_STRING,
"pageUrl",
ngx_string("pageUrl"),
v.page_url, sizeof(v.page_url) },
};
static ngx_rtmp_amf_elt_t in_elts[] = {
/* transaction in always 1 */
{ NGX_RTMP_AMF_NUMBER, NULL,
{ NGX_RTMP_AMF_NUMBER,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_OBJECT, NULL,
{ NGX_RTMP_AMF_OBJECT,
ngx_null_string,
in_cmd, sizeof(in_cmd) },
};
@ -132,45 +134,45 @@ ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v)
static ngx_rtmp_amf_elt_t out_obj[] = {
{ NGX_RTMP_AMF_STRING,
"fmsVer",
ngx_string("fmsVer"),
NGX_RTMP_FMS_VERSION, 0 },
{ NGX_RTMP_AMF_NUMBER,
"capabilities",
ngx_string("capabilities"),
&capabilities, 0 },
};
static ngx_rtmp_amf_elt_t out_inf[] = {
{ NGX_RTMP_AMF_STRING,
"level",
ngx_string("level"),
"status", 0 },
{ NGX_RTMP_AMF_STRING,
"code",
ngx_string("code"),
"NetConnection.Connect.Success", 0 },
{ NGX_RTMP_AMF_STRING,
"description",
ngx_string("description"),
"Connection succeeded.", 0 }
};
static ngx_rtmp_amf_elt_t out_elts[] = {
{ NGX_RTMP_AMF_STRING,
NULL,
ngx_null_string,
"_result", 0 },
{ NGX_RTMP_AMF_NUMBER,
NULL,
ngx_null_string,
&trans, 0 },
{ NGX_RTMP_AMF_OBJECT,
NULL,
ngx_null_string,
out_obj, sizeof(out_obj) },
{ NGX_RTMP_AMF_OBJECT,
NULL,
ngx_null_string,
out_inf, sizeof(out_inf) },
};
@ -254,7 +256,7 @@ ngx_rtmp_cmd_create_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
static ngx_rtmp_amf_elt_t in_elts[] = {
{ NGX_RTMP_AMF_NUMBER,
0,
ngx_null_string,
&v.trans, sizeof(v.trans) },
};
@ -281,19 +283,19 @@ ngx_rtmp_cmd_create_stream(ngx_rtmp_session_t *s, ngx_rtmp_create_stream_t *v)
static ngx_rtmp_amf_elt_t out_elts[] = {
{ NGX_RTMP_AMF_STRING,
NULL,
ngx_null_string,
"_result", 0 },
{ NGX_RTMP_AMF_NUMBER,
NULL,
ngx_null_string,
&trans, 0 },
{ NGX_RTMP_AMF_NULL,
NULL,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_NUMBER,
NULL,
ngx_null_string,
&stream, sizeof(stream) },
};
@ -324,15 +326,15 @@ ngx_rtmp_cmd_delete_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
static ngx_rtmp_amf_elt_t in_elts[] = {
{ NGX_RTMP_AMF_NUMBER,
0,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_NULL,
0,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_NUMBER,
0,
ngx_null_string,
&v.stream, 0 },
};
@ -366,19 +368,19 @@ ngx_rtmp_cmd_publish_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
/* transaction is always 0 */
{ NGX_RTMP_AMF_NUMBER,
0,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_NULL,
0,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_STRING,
0,
ngx_null_string,
&v.name, sizeof(v.name) },
{ NGX_RTMP_AMF_STRING,
0,
ngx_null_string,
&v.type, sizeof(v.type) },
};
@ -407,34 +409,34 @@ ngx_rtmp_cmd_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
static ngx_rtmp_amf_elt_t out_inf[] = {
{ NGX_RTMP_AMF_STRING,
"code",
ngx_string("code"),
"NetStream.Publish.Start", 0 },
{ NGX_RTMP_AMF_STRING,
"level",
ngx_string("level"),
"status", 0 },
{ NGX_RTMP_AMF_STRING,
"description",
ngx_string("description"),
"Publish succeeded.", 0 },
};
static ngx_rtmp_amf_elt_t out_elts[] = {
{ NGX_RTMP_AMF_STRING,
NULL,
ngx_null_string,
"onStatus", 0 },
{ NGX_RTMP_AMF_NUMBER,
NULL,
ngx_null_string,
&trans, 0 },
{ NGX_RTMP_AMF_NULL,
NULL,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_OBJECT,
NULL,
ngx_null_string,
out_inf, sizeof(out_inf) },
};
@ -473,11 +475,11 @@ ngx_rtmp_cmd_fcpublish_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
/* transaction is always 0 */
{ NGX_RTMP_AMF_NUMBER,
0,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_STRING,
0,
ngx_null_string,
&v.name, sizeof(v.name) },
};
@ -506,34 +508,34 @@ ngx_rtmp_cmd_fcpublish(ngx_rtmp_session_t *s, ngx_rtmp_fcpublish_t *v)
static ngx_rtmp_amf_elt_t out_inf[] = {
{ NGX_RTMP_AMF_STRING,
"code",
ngx_string("code"),
"NetStream.Publish.Start", 0 },
{ NGX_RTMP_AMF_STRING,
"level",
ngx_string("level"),
"status", 0 },
{ NGX_RTMP_AMF_STRING,
"description",
ngx_string("description"),
"FCPublish succeeded.", 0 },
};
static ngx_rtmp_amf_elt_t out_elts[] = {
{ NGX_RTMP_AMF_STRING,
NULL,
ngx_null_string,
"onFCPublish", 0 },
{ NGX_RTMP_AMF_NUMBER,
NULL,
ngx_null_string,
&trans, 0 },
{ NGX_RTMP_AMF_NULL,
NULL,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_OBJECT,
NULL,
ngx_null_string,
out_inf, sizeof(out_inf) },
};
@ -566,27 +568,27 @@ ngx_rtmp_cmd_play_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
/* transaction is always 0 */
{ NGX_RTMP_AMF_NUMBER,
0,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_NULL,
0,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_STRING,
0,
ngx_null_string,
&v.name, sizeof(v.name) },
{ NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_NUMBER,
0,
ngx_null_string,
&v.start, 0 },
{ NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_NUMBER,
0,
ngx_null_string,
&v.duration, 0 },
{ NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_BOOLEAN,
0,
ngx_null_string,
&v.reset, 0 }
};
@ -616,68 +618,68 @@ ngx_rtmp_cmd_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
static ngx_rtmp_amf_elt_t out_inf[] = {
{ NGX_RTMP_AMF_STRING,
"code",
ngx_string("code"),
"NetStream.Play.Reset", 0 },
{ NGX_RTMP_AMF_STRING,
"level",
ngx_string("level"),
"status", 0 },
{ NGX_RTMP_AMF_STRING,
"description",
ngx_string("description"),
"Playing and resetting.", 0 },
};
static ngx_rtmp_amf_elt_t out_elts[] = {
{ NGX_RTMP_AMF_STRING,
NULL,
ngx_null_string,
"onStatus", 0 },
{ NGX_RTMP_AMF_NUMBER,
NULL,
ngx_null_string,
&trans, 0 },
{ NGX_RTMP_AMF_NULL,
NULL,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_OBJECT,
NULL,
ngx_null_string,
out_inf, sizeof(out_inf) },
};
static ngx_rtmp_amf_elt_t out2_inf[] = {
{ NGX_RTMP_AMF_STRING,
"code",
ngx_string("code"),
"NetStream.Play.Start", 0 },
{ NGX_RTMP_AMF_STRING,
"level",
ngx_string("level"),
"status", 0 },
{ NGX_RTMP_AMF_STRING,
"description",
ngx_string("description"),
"Started playing.", 0 },
};
static ngx_rtmp_amf_elt_t out2_elts[] = {
{ NGX_RTMP_AMF_STRING,
NULL,
ngx_null_string,
"onStatus", 0 },
{ NGX_RTMP_AMF_NUMBER,
NULL,
ngx_null_string,
&trans, 0 },
{ NGX_RTMP_AMF_NULL,
NULL,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_OBJECT,
NULL,
ngx_null_string,
out2_inf,
sizeof(out2_inf) },
};
@ -685,33 +687,33 @@ ngx_rtmp_cmd_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
static ngx_rtmp_amf_elt_t out3_elts[] = {
{ NGX_RTMP_AMF_STRING,
NULL,
ngx_null_string,
"|RtmpSampleAccess", 0 },
{ NGX_RTMP_AMF_BOOLEAN,
NULL,
ngx_null_string,
&bfalse, 0 },
{ NGX_RTMP_AMF_BOOLEAN,
NULL,
ngx_null_string,
&bfalse, 0 },
};
static ngx_rtmp_amf_elt_t out4_inf[] = {
{ NGX_RTMP_AMF_STRING,
"code",
ngx_string("code"),
"NetStream.Data.Start", 0 },
};
static ngx_rtmp_amf_elt_t out4_elts[] = {
{ NGX_RTMP_AMF_STRING,
NULL,
ngx_null_string,
"onStatus", 0 },
{ NGX_RTMP_AMF_OBJECT,
NULL,
ngx_null_string,
out4_inf, sizeof(out4_inf) },
};
@ -772,11 +774,11 @@ ngx_rtmp_cmd_fcsubscribe_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
/* transaction is always 0 */
{ NGX_RTMP_AMF_NUMBER,
0,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_STRING,
0,
ngx_null_string,
&v.name, sizeof(v.name) },
};
@ -806,34 +808,34 @@ ngx_rtmp_cmd_fcsubscribe(ngx_rtmp_session_t *s, ngx_rtmp_fcsubscribe_t *v)
static ngx_rtmp_amf_elt_t out_inf[] = {
{ NGX_RTMP_AMF_STRING,
"code",
ngx_string("code"),
"NetStream.Play.Start", 0 },
{ NGX_RTMP_AMF_STRING,
"level",
ngx_string("level"),
"status", 0 },
{ NGX_RTMP_AMF_STRING,
"description",
ngx_string("description"),
"Started playing.", 0 },
};
static ngx_rtmp_amf_elt_t out_elts[] = {
{ NGX_RTMP_AMF_STRING,
NULL,
ngx_null_string,
"onFCSubscribe", 0 },
{ NGX_RTMP_AMF_NUMBER,
NULL,
ngx_null_string,
&trans, 0 },
{ NGX_RTMP_AMF_NULL,
NULL,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_OBJECT,
NULL,
ngx_null_string,
out_inf,
sizeof(out_inf) },
};

5
ngx_rtmp_receive.c
View file

@ -170,7 +170,10 @@ ngx_rtmp_amf_message_handler(ngx_rtmp_session_t *s,
static u_char func[128];
static ngx_rtmp_amf_elt_t elts[] = {
{ NGX_RTMP_AMF_STRING, 0, func, sizeof(func) },
{ NGX_RTMP_AMF_STRING,
ngx_null_string,
func, sizeof(func) },
};
c = s->connection;