- conn_list_t *ncn;
- struct sockaddr client;
- int nfd, len = sizeof(client);
-cp
- if((nfd = accept(cl->meta_socket, &client, &len)) < 0)
- {
- syslog(LOG_ERR, "Accepting a new connection failed: %m");
- return -1;
- }
-
- if((ncn = create_new_connection(nfd)) == NULL)
- {
- shutdown(nfd, 2);
- close(nfd);
- syslog(LOG_NOTICE, "Closed attempted connection.");
- return 0;
- }
-
- ncn->status.meta = 1;
- ncn->next = conn_list;
- conn_list = ncn;
-cp
- return 0;
-}
-
-/*
- dispatch any incoming meta requests
-*/
-int handle_incoming_meta_data(conn_list_t *cl)
-{
- 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)
- {
- syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, cl->meta_socket);
- return -1;
- }
- if(x)
- {
- syslog(LOG_ERR, "Metadata socket error: %s", sys_errlist[x]);
- return -1;
- }
-
- if(read(cl->meta_socket, &tmp, 1) <= 0)
- {
- syslog(LOG_ERR, "Receive failed: %m");
- return -1;
- }
-
- request = (int)(tmp[0]);
-
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "got request %d", request);
-
- /* This is a hack. After an ACK request, multiple ADD_HOSTs can
- follow. So if the request is one of these, only read as much
- bytes as necessary. (Luckily the ADD_HOST request is of fixed
- length) :P -- ivo */
-
- if(request != ACK)
- {
- if(request == ADD_HOST)
- {
- if((lenin = read(cl->meta_socket, &tmp[1], sizeof(add_host_t) - 1)) <= 0)
- {
- syslog(LOG_ERR, "Receive failed for ADD_HOST: %m");
- return -1;
- }
- }
- else
- {
- if((lenin = read(cl->meta_socket, &tmp[1], sizeof(tmp) - 1)) <= 0)
- {
- if(errno != EAGAIN) /* talk about hacks... */
- {
- syslog(LOG_ERR, "Receive failed: %m");
- return -1;
+ connection_t *c = data;
+ int result;
+ socklen_t len = sizeof(result);
+
+ if (c->status.remove)
+ return;
+
+ if(c->status.connecting) {
+ c->status.connecting = false;
+ getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+
+ if(!result)
+ finish_connecting(c);
+ else {
+ ifdebug(CONNECTIONS) logger(LOG_DEBUG,
+ _("Error while connecting to %s (%s): %s"),
+ c->name, c->hostname, strerror(result));
+ closesocket(c->socket);
+ do_outgoing_connection(c);
+ return;