char *type;
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
- if(routing_mode == RMODE_ROUTER)
+ if(routing_mode == RMODE_ROUTER) {
device = xstrdup(DEFAULT_TUN_DEVICE);
- else
+ } else {
device = xstrdup(DEFAULT_TAP_DEVICE);
+ }
}
if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
if(!strcasecmp(type, "tun"))
/* use default */;
- else if(!strcasecmp(type, "tap"))
+ else if(!strcasecmp(type, "tap")) {
device_type = DEVICE_TYPE_TAP;
- else {
+ } else {
logger(DEBUG_ALWAYS, LOG_ERR, "Unknown device type %s!", type);
return false;
}
} else {
- if(strstr(device, "tap") || routing_mode != RMODE_ROUTER)
+ if(strstr(device, "tap") || routing_mode != RMODE_ROUTER) {
device_type = DEVICE_TYPE_TAP;
+ }
}
- if(device_type == DEVICE_TYPE_TUN)
+ if(device_type == DEVICE_TYPE_TUN) {
device_info = "Solaris tun device";
- else
+ } else {
device_info = "Solaris tap device";
+ }
/* The following is black magic copied from OpenVPN. */
char *ptr = device;
get_config_string(lookup_config(config_tree, "Interface"), &ptr);
- while(*ptr && !isdigit(*ptr))
+ while(*ptr && !isdigit(*ptr)) {
ptr++;
+ }
+
int ppa = atoi(ptr);
/* Assign a new PPA and get its unit number. */
struct strioctl strioc_ppa = {
.ic_cmd = TUNNEWPPA,
.ic_len = sizeof(ppa),
- .ic_dp = (char *)&ppa,
+ .ic_dp = (char *) &ppa,
};
if(!*ptr) { /* no number given, try dynamic */
bool found = false;
+
while(!found && ppa < 64) {
int new_ppa = ioctl(device_fd, I_STR, &strioc_ppa);
+
if(new_ppa >= 0) {
ppa = new_ppa;
found = true;
break;
}
+
ppa++;
}
+
if(!found) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not find free PPA for %s %s!", device_info, device);
return false;
}
int if_fd;
+
if((if_fd = open(device, O_RDWR, 0)) < 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s\n", device, strerror(errno));
return false;
/* Remove muxes just in case they are left over from a crashed tincd */
struct lifreq ifr = {};
strncpy(ifr.lifr_name, iface, sizeof(ifr.lifr_name));
+
if(ioctl(ip_fd, SIOCGLIFMUXID, &ifr) >= 0) {
int muxid = ifr.lifr_arp_muxid;
ioctl(ip_fd, I_PUNLINK, muxid);
if(ioctl(if_fd, IF_UNITSEL, (char *)&ppa) < 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not set PPA %d on %s %s!", ppa, device_info, device);
return false;
- }
+ }
}
int arp_fd = -1;
logger(DEBUG_ALWAYS, LOG_ERR, "Could not set PPA %d on %s %s!", ppa, device_info, device);
return false;
}
+
if(ioctl(if_fd, SIOCGLIFFLAGS, &ifr) < 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not set flags on %s %s!", device_info, device);
return false;
/* Pop any modules on the stream */
while(true) {
- if(ioctl(ip_fd, I_POP, NULL) < 0)
+ if(ioctl(ip_fd, I_POP, NULL) < 0) {
break;
+ }
}
/* Push arp module to ip_fd */
struct strioctl strioc_if = {
.ic_cmd = SIOCSLIFNAME,
.ic_len = sizeof(ifr),
- .ic_dp = (char *)&ifr,
+ .ic_dp = (char *) &ifr,
};
if(ioctl(arp_fd, I_STR, &strioc_if) < 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not link %s %s to ARP", device_info, device);
return false;
}
+
close(arp_fd);
}
struct lifreq ifr = {};
+
strncpy(ifr.lifr_name, iface, sizeof(ifr.lifr_name));
+
ifr.lifr_ip_muxid = ip_muxid;
+
if(device_type == DEVICE_TYPE_TAP) {
ifr.lifr_arp_muxid = arp_muxid;
}
if(device_type == DEVICE_TYPE_TAP) {
ioctl(ip_fd, I_PUNLINK, arp_muxid);
}
+
ioctl(ip_fd, I_PUNLINK, ip_muxid);
logger(DEBUG_ALWAYS, LOG_ERR, "Could not set multiplexor id for %s %s", device_info, device);
return false;
if(iface) {
struct lifreq ifr = {};
strncpy(ifr.lifr_name, iface, sizeof(ifr.lifr_name));
+
if(ioctl(ip_fd, SIOCGLIFMUXID, &ifr) >= 0) {
int muxid = ifr.lifr_arp_muxid;
ioctl(ip_fd, I_PUNLINK, muxid);
}
}
- close(ip_fd); ip_fd = -1;
- close(device_fd); device_fd = -1;
+ close(ip_fd);
+ ip_fd = -1;
+ close(device_fd);
+ device_fd = -1;
- free(device); device = NULL;
- free(iface); iface = NULL;
+ free(device);
+ device = NULL;
+ free(iface);
+ iface = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
int f = 0;
switch(device_type) {
- case DEVICE_TYPE_TUN:
- sbuf.maxlen = MTU - 14;
- sbuf.buf = (char *)DATA(packet) + 14;
+ case DEVICE_TYPE_TUN:
+ sbuf.maxlen = MTU - 14;
+ sbuf.buf = (char *)DATA(packet) + 14;
- if((result = getmsg(device_fd, NULL, &sbuf, &f)) < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
- return false;
- }
+ if((result = getmsg(device_fd, NULL, &sbuf, &f)) < 0) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
+ return false;
+ }
- switch(DATA(packet)[14] >> 4) {
- case 4:
- DATA(packet)[12] = 0x08;
- DATA(packet)[13] = 0x00;
- break;
- case 6:
- DATA(packet)[12] = 0x86;
- DATA(packet)[13] = 0xDD;
- break;
- default:
- logger(DEBUG_TRAFFIC, LOG_ERR, "Unknown IP version %d while reading packet from %s %s", DATA(packet)[14] >> 4, device_info, device);
- return false;
- }
+ switch(DATA(packet)[14] >> 4) {
+ case 4:
+ DATA(packet)[12] = 0x08;
+ DATA(packet)[13] = 0x00;
+ break;
- memset(DATA(packet), 0, 12);
- packet->len = sbuf.len + 14;
+ case 6:
+ DATA(packet)[12] = 0x86;
+ DATA(packet)[13] = 0xDD;
break;
- case DEVICE_TYPE_TAP:
- sbuf.maxlen = MTU;
- sbuf.buf = (char *)DATA(packet);
+ default:
+ logger(DEBUG_TRAFFIC, LOG_ERR, "Unknown IP version %d while reading packet from %s %s", DATA(packet)[14] >> 4, device_info, device);
+ return false;
+ }
+
+ memset(DATA(packet), 0, 12);
+ packet->len = sbuf.len + 14;
+ break;
- if((result = getmsg(device_fd, NULL, &sbuf, &f)) < 0) {
- logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
- return false;
- }
+ case DEVICE_TYPE_TAP:
+ sbuf.maxlen = MTU;
+ sbuf.buf = (char *)DATA(packet);
- packet->len = sbuf.len;
- break;
+ if((result = getmsg(device_fd, NULL, &sbuf, &f)) < 0) {
+ logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
+ return false;
+ }
- default:
- abort();
+ packet->len = sbuf.len;
+ break;
+
+ default:
+ abort();
}
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info);
struct strbuf sbuf;
switch(device_type) {
- case DEVICE_TYPE_TUN:
- sbuf.len = packet->len - 14;
- sbuf.buf = (char *)DATA(packet) + 14;
+ case DEVICE_TYPE_TUN:
+ sbuf.len = packet->len - 14;
+ sbuf.buf = (char *)DATA(packet) + 14;
- if(putmsg(device_fd, NULL, &sbuf, 0) < 0) {
- logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
- return false;
- }
- break;
+ if(putmsg(device_fd, NULL, &sbuf, 0) < 0) {
+ logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
+ return false;
+ }
- case DEVICE_TYPE_TAP:
- sbuf.len = packet->len;
- sbuf.buf = (char *)DATA(packet);
+ break;
- if(putmsg(device_fd, NULL, &sbuf, 0) < 0) {
- logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
- return false;
- }
- break;
+ case DEVICE_TYPE_TAP:
+ sbuf.len = packet->len;
+ sbuf.buf = (char *)DATA(packet);
- default:
- abort();
+ if(putmsg(device_fd, NULL, &sbuf, 0) < 0) {
+ logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
+ return false;
+ }
+
+ break;
+
+ default:
+ abort();
}
return true;
projects / tinc / blobdiff