OlehKulykov пре 9 година
родитељ
комит
25aaeaf82a
3 измењених фајлова са 9 додато и 9 уклоњено
  1. 2 2
      src/rws_frame.c
  2. 1 1
      src/rws_frame.h
  3. 6 6
      src/rws_socketpriv.c

+ 2 - 2
src/rws_frame.c

@@ -237,12 +237,12 @@ void rws_frame_delete_clean(_rws_frame ** f)
 	}
 }
 
-unsigned int rws_check_recv_frame_size( const void *data ,const size_t data_size)
+size_t rws_check_recv_frame_size( const void *data ,const size_t data_size)
 {
     if (data && data_size >= 2)
     {
         const unsigned char * udata = (const unsigned char *)data;
-        const unsigned int is_finshd = (udata[0] >> 7) & 0x01;
+//        const unsigned int is_finshd = (udata[0] >> 7) & 0x01;
         const unsigned int is_masked = (udata[1] >> 7) & 0x01;
         const unsigned int payload = udata[1] & 0x7f;
         unsigned int header_size = is_masked ? 6 : 2;

+ 1 - 1
src/rws_frame.h

@@ -48,7 +48,7 @@ typedef struct _rws_frame_struct
 	unsigned char header_size;
 } _rws_frame;
 
-unsigned int rws_check_recv_frame_size(const void *data,const size_t data_size);
+size_t rws_check_recv_frame_size(const void *data,const size_t data_size);
 
 _rws_frame * rws_frame_create_with_recv_data(const void * data, const size_t data_size);
 

+ 6 - 6
src/rws_socketpriv.c

@@ -284,22 +284,22 @@ void rws_socket_idle_recv(_rws_socket * s)
 		return;
 	}
 
-   unsigned int nframe_size = rws_check_recv_frame_size(s->received,s->received_len);
-   if( nframe_size )
+   const size_t nframe_size = rws_check_recv_frame_size(s->received, s->received_len);
+   if (nframe_size)
    {
        frame = rws_frame_create_with_recv_data(s->received, nframe_size);
        if (frame) 
        {
            rws_socket_process_received_frame(s, frame);
        }
-       if( nframe_size == s->received_len)
+       if (nframe_size == s->received_len)
        {
            s->received_len = 0;
        }
-       else if( s->received_len > nframe_size)
+       else if (s->received_len > nframe_size)
        {
-           unsigned int nLeftLen = s->received_len-nframe_size;
-           memmove((char*)s->received,(char*)s->received+nframe_size,nLeftLen);
+           const size_t nLeftLen = s->received_len - nframe_size;
+           memmove((char*)s->received, (char*)s->received + nframe_size, nLeftLen);
            s->received_len = nLeftLen;
        }
    }