- if(getpeername(sfd, &ci, &len) < 0)
- {
- syslog(LOG_ERR, "Error: getpeername: %m");
- return NULL;
- }
-
- p->hostname = hostlookup(ci.sin_addr.s_addr);
- p->real_ip = ntohl(ci.sin_addr.s_addr);
- p->meta_socket = sfd;
- p->status.meta = 1;
-
- syslog(LOG_NOTICE, "Connection from %s:%d", p->hostname, htons(ci.sin_port));
-
- if(send_basic_info(p) < 0)
- {
- free(p);
- return NULL;
- }
-cp
- return p;
-}
-
-/*
- put all file descriptors in an fd_set array
-*/
-void build_fdset(fd_set *fs)
-{
- conn_list_t *p;
-cp
- FD_ZERO(fs);
-
- for(p = conn_list; p != NULL; p = p->next)
- {
- if(p->status.meta)
- FD_SET(p->meta_socket, fs);
- if(p->status.dataopen)
- FD_SET(p->socket, fs);
- }
-
- FD_SET(myself->meta_socket, fs);
- FD_SET(myself->socket, fs);
- FD_SET(tap_fd, fs);
-cp
-}
-
-/*
- receive incoming data from the listening
- udp socket and write it to the ethertap
- device after being decrypted
-*/
-int handle_incoming_vpn_data(conn_list_t *cl)
-{
- real_packet_t rp;
- int lenin;
- int x, l = sizeof(x);
- conn_list_t *f;
-cp
- if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
- {
- syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, cl->socket);
- return -1;
- }
- if(x)
- {
- syslog(LOG_ERR, "Incoming data socket error: %s", sys_errlist[x]);
- return -1;
- }
-
- rp.len = -1;
- lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
- if(lenin <= 0)
- {
- syslog(LOG_ERR, "Receiving data failed: %m");
- return -1;
- }
- total_socket_in += lenin;
- if(rp.len >= 0)
- {
- f = lookup_conn(rp.from);
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "packet from " IP_ADDR_S " (len %d)",
- IP_ADDR_V(rp.from), rp.len);
- if(!f)
- {
- syslog(LOG_ERR, "Got packet from unknown source " IP_ADDR_S,
- IP_ADDR_V(rp.from));
- return -1;
- }
-
- if(f->status.validkey)
- xrecv(f, &rp);
- else
- {
- add_queue(&(f->rq), &rp, rp.len);
- if(!cl->status.waitingforkey)
- send_key_request(rp.from);
- }
-
- if(my_key_expiry <= time(NULL))
- regenerate_keys();
+ if(FD_ISSET(c->socket, f))
+ {
+ if(c->status.connecting)
+ {
+ c->status.connecting = 0;
+ getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+ if(!result)
+ finish_connecting(c);
+ else
+ {
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_DEBUG, _("Error while connecting to %s (%s): %s"), c->name, c->hostname, strerror(result));
+ close(c->socket);
+ do_outgoing_connection(c);
+ continue;
+ }
+ }
+ if(receive_meta(c) < 0)
+ {
+ terminate_connection(c, c->status.active);
+ continue;
+ }
+ }