瀏覽代碼

net_state should return ssize_t not int.

removed some deug logging.
master
Richard Nyberg 19 年之前
父節點
當前提交
062d08cb60
共有 1 個檔案被更改,包括 5 行新增10 行删除
  1. +5
    -10
      btpd/net.c

+ 5
- 10
btpd/net.c 查看文件

@@ -214,7 +214,7 @@ net_progress(struct peer *p, size_t length)
} }
} }


static int static ssize_t
net_state(struct peer *p, struct io_buffer *iob) net_state(struct peer *p, struct io_buffer *iob)
{ {
switch (p->net_state) { switch (p->net_state) {
@@ -259,14 +259,11 @@ net_state(struct peer *p, struct io_buffer *iob)
return 4; return 4;
case NET_MSGHEAD: case NET_MSGHEAD:
p->msg_num = iob->buf[0]; p->msg_num = iob->buf[0];
if (!net_mh_ok(p)) { if (!net_mh_ok(p))
btpd_log(BTPD_L_ERROR, "error in head\n");
goto bad; goto bad;
} else if (p->msg_len == 1) { else if (p->msg_len == 1) {
if (net_dispatch_msg(p, iob->buf) != 0) { if (net_dispatch_msg(p, iob->buf) != 0)
btpd_log(BTPD_L_ERROR, "error in dispatch\n");
goto bad; goto bad;
}
net_set_state(p, NET_MSGSIZE, 4); net_set_state(p, NET_MSGSIZE, 4);
} else { } else {
uint8_t nstate = uint8_t nstate =
@@ -276,10 +273,8 @@ net_state(struct peer *p, struct io_buffer *iob)
return 1; return 1;
case NET_MSGPIECE: case NET_MSGPIECE:
case NET_MSGBODY: case NET_MSGBODY:
if (net_dispatch_msg(p, iob->buf) != 0) { if (net_dispatch_msg(p, iob->buf) != 0)
btpd_log(BTPD_L_ERROR, "error in dispatch\n");
goto bad; goto bad;
}
net_set_state(p, NET_MSGSIZE, 4); net_set_state(p, NET_MSGSIZE, 4);
return p->msg_len - 1; return p->msg_len - 1;
default: default:


||||||
x
 
000:0
Loading…
取消
儲存