Skip to content
Snippets Groups Projects
Commit 7260244a authored by rswindell's avatar rswindell
Browse files

Socket local_port and remote_port properties are returned as integers now

(instead of strings).
parent 3713e23f
No related branches found
No related tags found
No related merge requests found
...@@ -733,7 +733,6 @@ static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp) ...@@ -733,7 +733,6 @@ static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsval id, jsval *vp) static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
{ {
char str[128];
jsint tiny; jsint tiny;
ulong cnt; ulong cnt;
BOOL rd; BOOL rd;
...@@ -793,10 +792,8 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsval id, jsval *vp) ...@@ -793,10 +792,8 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
if(getsockname(p->sock, (struct sockaddr *)&addr,&addr_len)!=0) { if(getsockname(p->sock, (struct sockaddr *)&addr,&addr_len)!=0) {
p->last_error=ERROR_VALUE; p->last_error=ERROR_VALUE;
*vp = JSVAL_VOID; *vp = JSVAL_VOID;
} else { } else
sprintf(str,"%u",ntohs(addr.sin_port)); *vp = INT_TO_JSVAL(ntohs(addr.sin_port));
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx,str));
}
break; break;
case SOCK_PROP_REMOTE_IP: case SOCK_PROP_REMOTE_IP:
addr_len = sizeof(addr); addr_len = sizeof(addr);
...@@ -811,10 +808,8 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsval id, jsval *vp) ...@@ -811,10 +808,8 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
if(getpeername(p->sock, (struct sockaddr *)&addr,&addr_len)!=0) { if(getpeername(p->sock, (struct sockaddr *)&addr,&addr_len)!=0) {
p->last_error=ERROR_VALUE; p->last_error=ERROR_VALUE;
*vp = JSVAL_VOID; *vp = JSVAL_VOID;
} else { } else
sprintf(str,"%u",ntohs(addr.sin_port)); *vp = INT_TO_JSVAL(ntohs(addr.sin_port));
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx,str));
}
break; break;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment