~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/: Rename `bulkcrypto' structure to `bulkops'.
[tripe]
/
server
/
peer.c
diff --git
a/server/peer.c
b/server/peer.c
index
f4d8066
..
57891e7
100644
(file)
--- a/
server/peer.c
+++ b/
server/peer.c
@@
-306,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) {
@@
-658,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++;
@@
-798,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));