projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanups:
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
90bb88f
..
564bce2
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-157,13
+157,13
@@
cp
if(debug_lvl > 3)
syslog(LOG_DEBUG, "packet to queue: %d", s);
if(debug_lvl > 3)
syslog(LOG_DEBUG, "packet to queue: %d", s);
- e = xmalloc(sizeof(
queue_element_t
));
+ e = xmalloc(sizeof(
*e
));
e->packet = xmalloc(s);
memcpy(e->packet, packet, s);
if(!*q)
{
e->packet = xmalloc(s);
memcpy(e->packet, packet, s);
if(!*q)
{
- *q = xmalloc(sizeof(
packet_queue_t
));
+ *q = xmalloc(sizeof(
**q
));
(*q)->head = (*q)->tail = NULL;
}
(*q)->head = (*q)->tail = NULL;
}
@@
-914,7
+914,7
@@
int handle_new_meta_connection(conn_list_t *cl)
{
conn_list_t *ncn;
struct sockaddr client;
{
conn_list_t *ncn;
struct sockaddr client;
- int nfd, len = sizeof(
struct sockaddr
);
+ int nfd, len = sizeof(
client
);
cp
if((nfd = accept(cl->meta_socket, &client, &len)) < 0)
{
cp
if((nfd = accept(cl->meta_socket, &client, &len)) < 0)
{
@@
-957,7
+957,7
@@
cp
return -1;
}
return -1;
}
- if((lenin = re
cv(cl->meta_socket, &tmp, sizeof(tmp), 0
)) <= 0)
+ if((lenin = re
ad(cl->meta_socket, &tmp, sizeof(tmp)
)) <= 0)
{
syslog(LOG_ERR, "Receive failed: %m");
return -1;
{
syslog(LOG_ERR, "Receive failed: %m");
return -1;