fix a warning on 32 bits

[src/app-framework-binder.git] / src / websock.c

diff --git a/src/websock.c b/src/websock.c
index 04661c1..1b127c8 100644 (file)
--- a/src/websock.c
+++ b/src/websock.c
@@ -45,7 +45,7 @@
 #define FRAME_SET_RSV3(BYTE)        (((BYTE) & 0x01) << 4)
 #define FRAME_SET_OPCODE(BYTE)      ((BYTE) & 0x0F)
 #define FRAME_SET_MASK(BYTE)        (((BYTE) & 0x01) << 7)
-#define FRAME_SET_LENGTH(X64, IDX)  (unsigned char)(((X64) >> ((IDX)*8)) & 0xFF)
+#define FRAME_SET_LENGTH(X64, IDX)  (unsigned char)((sizeof(X64)) <= (IDX) ? 0 : (((X64) >> ((IDX)*8)) & 0xFF))
 
 #define OPCODE_CONTINUATION 0x0
 #define OPCODE_TEXT         0x1
@@ -303,7 +303,7 @@ static int check_control_header(struct websock *ws)
        return 1;
 }
 
-int websock_dispatch(struct websock *ws)
+int websock_dispatch(struct websock *ws, int loop)
 {
        uint16_t code;
 loop:
@@ -418,16 +418,22 @@ loop:
                        ws->itf->on_continue(ws->closure,
                                             FRAME_GET_FIN(ws->header[0]),
                                             (size_t) ws->length);
+                       if (!loop)
+                               return 0;
                        break;
                case OPCODE_TEXT:
                        ws->itf->on_text(ws->closure,
                                         FRAME_GET_FIN(ws->header[0]),
                                         (size_t) ws->length);
+                       if (!loop)
+                               return 0;
                        break;
                case OPCODE_BINARY:
                        ws->itf->on_binary(ws->closure,
                                           FRAME_GET_FIN(ws->header[0]),
                                           (size_t) ws->length);
+                       if (!loop)
+                               return 0;
                        break;
                case OPCODE_CLOSE:
                        if (ws->length == 0)
@@ -447,6 +453,8 @@ loop:
                                websock_pong(ws, NULL, 0);
                        }
                        ws->state = STATE_INIT;
+                       if (!loop)
+                               return 0;
                        break;
                case OPCODE_PONG:
                        if (ws->itf->on_pong)
@@ -454,6 +462,8 @@ loop:
                        else
                                websock_drop(ws);
                        ws->state = STATE_INIT;
+                       if (!loop)
+                               return 0;
                        break;
                default:
                        goto protocol_error;