lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 04:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: socket readall , clear buffer offset

Browse Source
This commit is contained in:
云风
2013-11-25 19:54:13 +08:00
parent 022119e22a
commit dca23999d0
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lualib-src/lua-socket.c
View File

@@ -133,6 +133,7 @@ lpushbuffer(lua_State *L) {
static void static void
return_free_node(lua_State *L, int pool, struct socket_buffer *sb) { return_free_node(lua_State *L, int pool, struct socket_buffer *sb) {
struct buffer_node *free_node = sb->head; struct buffer_node *free_node = sb->head;
sb->offset = 0;
sb->head = free_node->next; sb->head = free_node->next;
if (sb->head == NULL) { if (sb->head == NULL) {
sb->tail = NULL; sb->tail = NULL;
@@ -158,7 +159,6 @@ pop_lstring(lua_State *L, struct socket_buffer *sb, int sz, int skip) {
} }
if (sz == current->sz - sb->offset) { if (sz == current->sz - sb->offset) {
lua_pushlstring(L, current->msg + sb->offset, sz-skip); lua_pushlstring(L, current->msg + sb->offset, sz-skip);
sb->offset = 0;
return_free_node(L,2,sb); return_free_node(L,2,sb);
return; return;
} }
@@ -174,13 +174,11 @@ pop_lstring(lua_State *L, struct socket_buffer *sb, int sz, int skip) {
sb->offset += sz; sb->offset += sz;
if (bytes == sz) { if (bytes == sz) {
return_free_node(L,2,sb); return_free_node(L,2,sb);
sb->offset = 0;
} }
break; break;
} }
luaL_addlstring(&b, current->msg + sb->offset, (sz - skip < bytes) ? sz - skip : bytes); luaL_addlstring(&b, current->msg + sb->offset, (sz - skip < bytes) ? sz - skip : bytes);
return_free_node(L,2,sb); return_free_node(L,2,sb);
sb->offset = 0;
sz-=bytes; sz-=bytes;
if (sz==0) if (sz==0)
break; break;