~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/admin.c: Fix `=' vs `==' error in assertion.
[tripe]
/
server
/
peer.c
diff --git
a/server/peer.c
b/server/peer.c
index
75f7acb
..
57891e7
100644
(file)
--- a/
server/peer.c
+++ b/
server/peer.c
@@
-204,10
+204,9
@@
static int p_decrypt(peer **pp, addr *a, size_t n,
p = q;
goto match;
}
p = q;
goto match;
}
- T( trace(T_PEER, "peer: failed to decrypt: try other mobile peers...",
- p_name(q)); )
+ T( trace(T_PEER, "peer: failed to decrypt: try other mobile peers..."); )
} else if (nmobile)
} else if (nmobile)
- T( trace(T_PEER, "peer: unknown source: trying mobile peers...")
; )
+ T( trace(T_PEER, "peer: unknown source: trying mobile peers...")
);
else {
p = 0;
goto searched;
else {
p = 0;
goto searched;
@@
-307,14
+306,14
@@
static void p_read(int fd, unsigned mode, void *v)
{
peer *p = 0;
addr a;
{
peer *p = 0;
addr a;
- s
ize
_t sz;
+ s
ocklen
_t sz;
ssize_t n;
int ch;
buf b, bb;
/* --- Read the data --- */
ssize_t n;
int ch;
buf b, bb;
/* --- Read the data --- */
-
TIMER
;
+
QUICKRAND
;
sz = sizeof(addr);
n = recvfrom(fd, buf_i, sizeof(buf_i), 0, &a.sa, &sz);
if (n < 0) {
sz = sizeof(addr);
n = recvfrom(fd, buf_i, sizeof(buf_i), 0, &a.sa, &sz);
if (n < 0) {
@@
-659,7
+658,7
@@
void p_tun(peer *p, buf *b)
{
buf *bb = p_txstart(p, MSG_PACKET);
{
buf *bb = p_txstart(p, MSG_PACKET);
-
TIMER
;
+
QUICKRAND
;
p_encrypt(p, MSG_PACKET, b, bb);
if (BOK(bb) && BLEN(bb)) {
p->st.n_ipout++;
p_encrypt(p, MSG_PACKET, b, bb);
if (BOK(bb) && BLEN(bb)) {
p->st.n_ipout++;
@@
-799,7
+798,7
@@
void p_init(struct in_addr addr, unsigned port)
unsigned p_port(void)
{
addr a;
unsigned p_port(void)
{
addr a;
- s
ize
_t sz = sizeof(addr);
+ s
ocklen
_t sz = sizeof(addr);
if (getsockname(sock.fd, &a.sa, &sz))
die(EXIT_FAILURE, "couldn't read port number: %s", strerror(errno));
if (getsockname(sock.fd, &a.sa, &sz))
die(EXIT_FAILURE, "couldn't read port number: %s", strerror(errno));