From 26ed48c4e616014ee760fd13d13dbdc8539c34e3 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 22 十二月 2020 19:21:55 +0800
Subject: [PATCH] 解决sendandrecv发送到一个不存在key的情况
---
src/socket/net_mod_socket_io.c | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/src/socket/net_mod_socket_io.c b/src/socket/net_mod_socket_io.c
index a4dbf0d..8981690 100644
--- a/src/socket/net_mod_socket_io.c
+++ b/src/socket/net_mod_socket_io.c
@@ -1,15 +1,14 @@
#include "net_mod_socket_io.h"
#include "socket_io.h"
-
+#include <stdint.h>
-ssize_t rio_readpkgb(rio_t *rp, char *usrbuf, size_t maxlen)
+ssize_t rio_read_until_sep(rio_t *rp, char *usrbuf, size_t maxlen, const char *sep)
{
int n, rc;
char c;
char *bufp = usrbuf;
- int pkg_sep_i = 0;
- int pkg_sep_len = strlen(PKG_SEP);
- const char * pkg_sep = PKG_SEP;
+ int sep_i = 0;
+ int sep_len = strlen(sep);
for (n = 0; n < maxlen; n++)
{
@@ -18,15 +17,15 @@
*bufp++ = c;
- if(c == *(pkg_sep + pkg_sep_i)) {
- pkg_sep_i++;
- if(pkg_sep_i == pkg_sep_len) {
+ if(c == *(sep + sep_i)) {
+ sep_i++;
+ if(sep_i == sep_len) {
break;
}
} else {
- pkg_sep_i = 0;
+ sep_i = 0;
}
}
@@ -41,11 +40,79 @@
return -1; /* Error */
}
- if(pkg_sep_i == pkg_sep_len) {
- *(bufp - pkg_sep_len) = 0;
- return n - pkg_sep_len;
+ if(sep_i == sep_len) {
+ *(bufp - sep_len) = 0;
+ return n - sep_len;
} else {
return -1;
}
+}
+
+
+
+int is_little_endian() {
+ int test_num = 0xff;
+ unsigned char* byte_start = (unsigned char*) &test_num;
+
+ if (byte_start[0] == 0xff) {
+ return 1;
+ }
+ return 0;
+}
+
+void swap_bytes(void *pv, size_t n)
+{
+ assert(n > 0);
+
+ char *p = (char *)pv;
+ size_t lo, hi;
+ for(lo=0, hi=n-1; hi>lo; lo++, hi--)
+ {
+ char tmp=p[lo];
+ p[lo] = p[hi];
+ p[hi] = tmp;
+ }
+}
+
+
+//! Byte swap unsigned short
+uint16_t swap_uint16( uint16_t val )
+{
+ return (val << 8) | (val >> 8 );
+}
+
+//! Byte swap short
+int16_t swap_int16( int16_t val )
+{
+ return (val << 8) | ((val >> 8) & 0xFF);
+}
+
+//! Byte swap unsigned int
+uint32_t swap_uint32( uint32_t val )
+{
+ val = ((val << 8) & 0xFF00FF00 ) | ((val >> 8) & 0xFF00FF );
+ return (val << 16) | (val >> 16);
+}
+
+//! Byte swap int
+int32_t swap_int32( int32_t val )
+{
+ val = ((val << 8) & 0xFF00FF00) | ((val >> 8) & 0xFF00FF );
+ return (val << 16) | ((val >> 16) & 0xFFFF);
+}
+
+
+int64_t swap_int64( int64_t val )
+{
+ val = ((val << 8) & 0xFF00FF00FF00FF00ULL ) | ((val >> 8) & 0x00FF00FF00FF00FFULL );
+ val = ((val << 16) & 0xFFFF0000FFFF0000ULL ) | ((val >> 16) & 0x0000FFFF0000FFFFULL );
+ return (val << 32) | ((val >> 32) & 0xFFFFFFFFULL);
+}
+
+uint64_t swap_uint64( uint64_t val )
+{
+ val = ((val << 8) & 0xFF00FF00FF00FF00ULL ) | ((val >> 8) & 0x00FF00FF00FF00FFULL );
+ val = ((val << 16) & 0xFFFF0000FFFF0000ULL ) | ((val >> 16) & 0x0000FFFF0000FFFFULL );
+ return (val << 32) | (val >> 32);
}
\ No newline at end of file
--
Gitblit v1.8.0