Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
daca85d1
Commit
daca85d1
authored
19 years ago
by
rswindell
Browse files
Options
Downloads
Patches
Plain Diff
Use "protocol" instead of "service" for calls to open_socket().
parent
d9f74ecc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/sbbs3/js_socket.c
+4
-4
4 additions, 4 deletions
src/sbbs3/js_socket.c
src/sbbs3/sbbs.h
+1
-1
1 addition, 1 deletion
src/sbbs3/sbbs.h
with
5 additions
and
5 deletions
src/sbbs3/js_socket.c
+
4
−
4
View file @
daca85d1
...
@@ -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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/sbbs3/sbbs.h
+
1
−
1
View file @
daca85d1
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment