提交 2cdafeeb authored 作者: Michael Jerris's avatar Michael Jerris

fix for MODLANG-51, MODLANG-52

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7748 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 19135f23
...@@ -44,15 +44,17 @@ typedef struct js_socket_obj js_socket_obj_t; ...@@ -44,15 +44,17 @@ typedef struct js_socket_obj js_socket_obj_t;
/*********************************************************************************/ /*********************************************************************************/
static JSBool socket_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) static JSBool socket_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
{ {
if (argc > 0) {
js_socket_obj_t* js_socket_obj = 0; js_socket_obj_t* js_socket_obj = 0;
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
switch_socket_t *socket; switch_socket_t *socket;
switch_status_t ret;
switch_core_new_memory_pool(&pool); switch_core_new_memory_pool(&pool);
if (!switch_socket_create(&socket, AF_INET, SOCK_STREAM, SWITCH_PROTO_TCP, pool)) ret = switch_socket_create(&socket, AF_INET, SOCK_STREAM, SWITCH_PROTO_TCP, pool);
if (ret != SWITCH_STATUS_SUCCESS)
{ {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Failed to create socket.\n"); switch_core_destroy_memory_pool(&pool);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Failed to create socket, reason: %d.\n", ret);
return JS_FALSE; return JS_FALSE;
} }
...@@ -63,9 +65,6 @@ static JSBool socket_construct(JSContext * cx, JSObject * obj, uintN argc, jsval ...@@ -63,9 +65,6 @@ static JSBool socket_construct(JSContext * cx, JSObject * obj, uintN argc, jsval
js_socket_obj->socket = socket; js_socket_obj->socket = socket;
JS_SetPrivate(cx, obj, js_socket_obj); JS_SetPrivate(cx, obj, js_socket_obj);
return JS_TRUE; return JS_TRUE;
}
return JS_FALSE;
} }
static void socket_destroy(JSContext * cx, JSObject * obj) static void socket_destroy(JSContext * cx, JSObject * obj)
...@@ -115,7 +114,7 @@ static JSBool socket_connect(JSContext * cx, JSObject * obj, uintN argc, jsval * ...@@ -115,7 +114,7 @@ static JSBool socket_connect(JSContext * cx, JSObject * obj, uintN argc, jsval *
*rval = BOOLEAN_TO_JSVAL(JS_FALSE); *rval = BOOLEAN_TO_JSVAL(JS_FALSE);
} }
else else
*rval = BOOLEAN_TO_JSVAL(JS_FALSE); *rval = BOOLEAN_TO_JSVAL(JS_TRUE);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论