chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/tests.at (AWAIT_KXDONE): Ignore the correct server messages.
[tripe]
/
pkstream
/
pkstream.c
diff --git
a/pkstream/pkstream.c
b/pkstream/pkstream.c
index b84c98b2e16abe7d2dec9c41fb06d1d60cb22a87..4a1ccf5004150783d227f91732d5fb4c19798557 100644
(file)
--- a/
pkstream/pkstream.c
+++ b/
pkstream/pkstream.c
@@
-54,6
+54,8
@@
#include <mLib/sel.h>
#include <mLib/selpk.h>
#include <mLib/sel.h>
#include <mLib/selpk.h>
+#include "util.h"
+
/*----- Data structures ---------------------------------------------------*/
typedef struct pk {
/*----- Data structures ---------------------------------------------------*/
typedef struct pk {
@@
-127,7
+129,7
@@
static void rdtcp(octet *b, size_t sz, pkbuf *pk, size_t *k, void *vp)
}
pksz = LOAD16(b);
if (pksz + 2 == sz) {
}
pksz = LOAD16(b);
if (pksz + 2 == sz) {
-
write(fd_udp, b + 2, pksz
);
+
DISCARD(write(fd_udp, b + 2, pksz)
);
selpk_want(&p->p, 2);
} else {
selpk_want(&p->p, pksz + 2);
selpk_want(&p->p, 2);
} else {
selpk_want(&p->p, pksz + 2);
@@
-392,6
+394,7
@@
int main(int argc, char *argv[])
break;
case 'b':
parseaddr(optarg, &bindaddr.sin_addr, 0);
break;
case 'b':
parseaddr(optarg, &bindaddr.sin_addr, 0);
+ cw.me.sin_addr = bindaddr.sin_addr;
break;
case 'c':
parseaddr(optarg, &connaddr.sin_addr, &pt);
break;
case 'c':
parseaddr(optarg, &connaddr.sin_addr, &pt);