along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net_socket.c,v 1.1.2.28 2003/07/18 13:41:35 guus Exp $
+ $Id: net_socket.c,v 1.1.2.30 2003/07/22 20:55:20 guus Exp $
*/
#include "system.h"
int nfd, flags;
char *addrstr;
int option;
- char *interface;
+ char *iface;
struct ifreq ifr;
cp();
#endif
if(get_config_string
- (lookup_config(config_tree, "BindToInterface"), &interface)) {
+ (lookup_config(config_tree, "BindToInterface"), &iface)) {
#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+ strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
close(nfd);
- logger(LOG_ERR, _("Can't bind to interface %s: %s"), interface,
+ logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
strerror(errno));
return -1;
}
char *addrstr;
int option;
#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
- char *interface;
+ char *iface;
struct ifreq ifr;
#endif
#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
if(get_config_string
- (lookup_config(config_tree, "BindToInterface"), &interface)) {
+ (lookup_config(config_tree, "BindToInterface"), &iface)) {
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+ strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
close(nfd);
- logger(LOG_ERR, _("Can't bind to interface %s: %s"), interface,
+ logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
strerror(errno));
return -1;
}
if(!c->outgoing->cfg) {
ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"),
c->name);
- c->status.remove = 1;
+ c->status.remove = true;
retry_outgoing(c->outgoing);
return;
}
if(result == -1) {
if(errno == EINPROGRESS) {
- c->status.connecting = 1;
+ c->status.connecting = true;
return;
}
accept a new tcp connect and create a
new connection
*/
-int handle_new_meta_connection(int sock)
+bool handle_new_meta_connection(int sock)
{
connection_t *c;
sockaddr_t sa;
if(fd < 0) {
logger(LOG_ERR, _("Accepting a new connection failed: %s"),
strerror(errno));
- return -1;
+ return false;
}
sockaddrunmap(&sa);
c->allow_request = ID;
send_id(c);
- return 0;
+ return true;
}
void try_outgoing_connections(void)
cfg = lookup_config_next(config_tree, cfg)) {
get_config_string(cfg, &name);
- if(check_id(name)) {
+ if(!check_id(name)) {
logger(LOG_ERR,
_("Invalid name for outgoing connection in %s line %d"),
cfg->file, cfg->line);