do_decrypt((real_packet_t*)packet, &vp, cl->key);
add_mac_addresses(&vp);
- if((lenin = write_n(tap_fd, &vp, vp.len + 2)) < 0)
+ if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
syslog(LOG_ERR, "Can't write to tap device: %m");
else
total_tap_out += lenin;
*/
int handle_incoming_meta_data(conn_list_t *cl)
{
- int x, l = sizeof(x), lenin;
+ int x, l = sizeof(x);
unsigned char tmp[1600];
int request;
+ int lenin = 0;
cp
if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
return -1;
}
- if((lenin = read(cl->meta_socket, &tmp, sizeof(tmp))) <= 0)
+ if(read(cl->meta_socket, &tmp, 1) <= 0)
{
syslog(LOG_ERR, "Receive failed: %m");
return -1;
if(request_handlers[request] == NULL)
syslog(LOG_ERR, "Unknown request %d.", request);
else
- if(request_handlers[request](cl, tmp, lenin) < 0)
+ if(request_handlers[request](cl) < 0)
return -1;
cp
return 0;
if(p->status.remove)
continue;
- if(p->status.active)
+ if(p->status.dataopen)
if(FD_ISSET(p->socket, f))
{
/*
}
/*
- this is where it al happens...
+ this is where it all happens...
*/
void main_loop(void)
{