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

Use "protocol" instead of "service" for calls to open_socket().

parent d9f74ecc
No related branches found
No related tags found
No related merge requests found
...@@ -1309,13 +1309,13 @@ js_socket_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv ...@@ -1309,13 +1309,13 @@ js_socket_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
int32 type=SOCK_STREAM; /* default = TCP */ int32 type=SOCK_STREAM; /* default = TCP */
uintN i; uintN i;
private_t* p; private_t* p;
char* sock_service=NULL; char* protocol=NULL;
for(i=0;i<argc;i++) { for(i=0;i<argc;i++) {
if(JSVAL_IS_NUMBER(argv[i])) if(JSVAL_IS_NUMBER(argv[i]))
JS_ValueToInt32(cx,argv[i],&type); JS_ValueToInt32(cx,argv[i],&type);
else if(sock_service==NULL) else if(protocol==NULL)
sock_service=JS_GetStringBytes(JS_ValueToString(cx,argv[i])); protocol=JS_GetStringBytes(JS_ValueToString(cx,argv[i]));
} }
if((p=(private_t*)malloc(sizeof(private_t)))==NULL) { if((p=(private_t*)malloc(sizeof(private_t)))==NULL) {
...@@ -1324,7 +1324,7 @@ js_socket_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv ...@@ -1324,7 +1324,7 @@ js_socket_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
} }
memset(p,0,sizeof(private_t)); memset(p,0,sizeof(private_t));
if((p->sock=open_socket(type,sock_service))==INVALID_SOCKET) { if((p->sock=open_socket(type,protocol))==INVALID_SOCKET) {
JS_ReportError(cx,"open_socket failed with error %d",ERROR_VALUE); JS_ReportError(cx,"open_socket failed with error %d",ERROR_VALUE);
return(JS_FALSE); return(JS_FALSE);
} }
......
...@@ -1046,7 +1046,7 @@ BOOL md(char *path); ...@@ -1046,7 +1046,7 @@ BOOL md(char *path);
int lputs(int level, char *); /* log output */ int lputs(int level, char *); /* log output */
int lprintf(int level, char *fmt, ...); /* log output */ int lprintf(int level, char *fmt, ...); /* log output */
int eprintf(int level, char *fmt, ...); /* event log */ int eprintf(int level, char *fmt, ...); /* event log */
SOCKET open_socket(int type, const char* service); SOCKET open_socket(int type, const char* protocol);
SOCKET accept_socket(SOCKET s, SOCKADDR* addr, socklen_t* addrlen); SOCKET accept_socket(SOCKET s, SOCKADDR* addr, socklen_t* addrlen);
int close_socket(SOCKET); int close_socket(SOCKET);
u_long resolve_ip(char *addr); u_long resolve_ip(char *addr);
......
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