Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libwebsockets
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
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Fork
libwebsockets
Commits
760c3d4a
Commit
760c3d4a
authored
12 years ago
by
Andy Green
Browse files
Options
Downloads
Patches
Plain Diff
fix no extensions build
Signed-off-by:
Andy Green
<
andy.green@linaro.org
>
parent
a7521deb
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/client-handshake.c
+1
-1
1 addition, 1 deletion
lib/client-handshake.c
lib/client-parser.c
+3
-4
3 additions, 4 deletions
lib/client-parser.c
lib/libwebsockets.c
+0
-2
0 additions, 2 deletions
lib/libwebsockets.c
with
4 additions
and
7 deletions
lib/client-handshake.c
+
1
−
1
View file @
760c3d4a
...
...
@@ -166,8 +166,8 @@ libwebsocket_client_connect(struct libwebsocket_context *context,
int
ietf_version_or_minus_one
)
{
struct
libwebsocket
*
wsi
;
int
n
;
#ifndef LWS_NO_EXTENSIONS
int
n
;
int
m
;
struct
libwebsocket_extension
*
ext
;
int
handled
;
...
...
This diff is collapsed.
Click to expand it.
lib/client-parser.c
+
3
−
4
View file @
760c3d4a
...
...
@@ -23,11 +23,11 @@
int
libwebsocket_client_rx_sm
(
struct
libwebsocket
*
wsi
,
unsigned
char
c
)
{
int
n
;
int
callback_action
=
LWS_CALLBACK_CLIENT_RECEIVE
;
int
handled
;
struct
lws_tokens
eff_buf
;
#ifndef LWS_NO_EXTENSIONS
int
n
;
int
m
;
#endif
...
...
@@ -274,11 +274,10 @@ spill:
lwsl_parser
(
"client sees server close len = %d
\n
"
,
wsi
->
u
.
ws
.
rx_user_buffer_head
);
/* parrot the close packet payload back */
n
=
libwebsocket_write
(
wsi
,
(
unsigned
char
*
)
libwebsocket_write
(
wsi
,
(
unsigned
char
*
)
&
wsi
->
u
.
ws
.
rx_user_buffer
[
LWS_SEND_BUFFER_PRE_PADDING
],
wsi
->
u
.
ws
.
rx_user_buffer_head
,
LWS_WRITE_CLOSE
);
lwsl_parser
(
"client send close ack returned %d
\n
"
,
n
);
wsi
->
state
=
WSI_STATE_RETURNED_CLOSE_ALREADY
;
/* close the connection */
return
-
1
;
...
...
@@ -286,7 +285,7 @@ spill:
case
LWS_WS_OPCODE_07__PING
:
lwsl_info
(
"client received ping, doing pong
\n
"
);
/* parrot the ping packet payload back as a pong*/
n
=
libwebsocket_write
(
wsi
,
(
unsigned
char
*
)
libwebsocket_write
(
wsi
,
(
unsigned
char
*
)
&
wsi
->
u
.
ws
.
rx_user_buffer
[
LWS_SEND_BUFFER_PRE_PADDING
],
wsi
->
u
.
ws
.
rx_user_buffer_head
,
...
...
This diff is collapsed.
Click to expand it.
lib/libwebsockets.c
+
0
−
2
View file @
760c3d4a
...
...
@@ -331,9 +331,7 @@ libwebsocket_close_and_free_session(struct libwebsocket_context *context,
/* else, the send failed and we should just hang up */
}
#ifndef LWS_NO_EXTENSIONS
just_kill_connection:
#endif
lwsl_debug
(
"close: just_kill_connection
\n
"
);
...
...
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