Switch to K&R style indentation.
This commit is contained in:
Guus Sliepen
parent
5fc1ed17f4
commit
f75dcef72a
44 changed files with 6039 additions and 6132 deletions
|
|
@ -17,7 +17,7 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
$Id: device.c,v 1.1.2.8 2002/06/21 10:11:37 guus Exp $
|
||||
$Id: device.c,v 1.1.2.9 2002/09/09 21:25:28 guus Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
|
@ -61,136 +61,126 @@ subnet_t mymac;
|
|||
|
||||
int setup_device(void)
|
||||
{
|
||||
int ip_fd = -1, if_fd = -1;
|
||||
int ppa;
|
||||
char *ptr;
|
||||
int ip_fd = -1, if_fd = -1;
|
||||
int ppa;
|
||||
char *ptr;
|
||||
|
||||
cp
|
||||
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
|
||||
device = DEFAULT_DEVICE;
|
||||
cp if(!get_config_string(lookup_config(config_tree, "Device"), &device))
|
||||
device = DEFAULT_DEVICE;
|
||||
|
||||
cp
|
||||
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
|
||||
{
|
||||
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
cp
|
||||
ppa = 0;
|
||||
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
|
||||
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
cp ppa = 0;
|
||||
|
||||
ptr = device;
|
||||
while(*ptr && !isdigit((int)*ptr)) ptr++;
|
||||
ppa = atoi(ptr);
|
||||
ptr = device;
|
||||
while(*ptr && !isdigit((int) *ptr))
|
||||
ptr++;
|
||||
ppa = atoi(ptr);
|
||||
|
||||
if( (ip_fd = open("/dev/ip", O_RDWR, 0)) < 0){
|
||||
syslog(LOG_ERR, _("Could not open /dev/ip: %s"), strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
if((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) {
|
||||
syslog(LOG_ERR, _("Could not open /dev/ip: %s"), strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Assign a new PPA and get its unit number. */
|
||||
if( (ppa = ioctl(device_fd, TUNNEWPPA, ppa)) < 0){
|
||||
syslog(LOG_ERR, _("Can't assign new interface: %s"), strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
/* Assign a new PPA and get its unit number. */
|
||||
if((ppa = ioctl(device_fd, TUNNEWPPA, ppa)) < 0) {
|
||||
syslog(LOG_ERR, _("Can't assign new interface: %s"), strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if( (if_fd = open(device, O_RDWR, 0)) < 0){
|
||||
syslog(LOG_ERR, _("Could not open %s twice: %s"), device, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
if((if_fd = open(device, O_RDWR, 0)) < 0) {
|
||||
syslog(LOG_ERR, _("Could not open %s twice: %s"), device,
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(ioctl(if_fd, I_PUSH, "ip") < 0){
|
||||
syslog(LOG_ERR, _("Can't push IP module: %s"), strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
if(ioctl(if_fd, I_PUSH, "ip") < 0) {
|
||||
syslog(LOG_ERR, _("Can't push IP module: %s"), strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Assign ppa according to the unit number returned by tun device */
|
||||
if(ioctl(if_fd, IF_UNITSEL, (char *)&ppa) < 0){
|
||||
syslog(LOG_ERR, _("Can't set PPA %d: %s"), ppa, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
/* Assign ppa according to the unit number returned by tun device */
|
||||
if(ioctl(if_fd, IF_UNITSEL, (char *) &ppa) < 0) {
|
||||
syslog(LOG_ERR, _("Can't set PPA %d: %s"), ppa, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(ioctl(ip_fd, I_LINK, if_fd) < 0){
|
||||
syslog(LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
if(ioctl(ip_fd, I_LINK, if_fd) < 0) {
|
||||
syslog(LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
|
||||
asprintf(&interface, "tun%d", ppa);
|
||||
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
|
||||
asprintf(&interface, "tun%d", ppa);
|
||||
|
||||
device_info = _("Solaris tun device");
|
||||
device_info = _("Solaris tun device");
|
||||
|
||||
/* Set default MAC address for ethertap devices */
|
||||
/* Set default MAC address for ethertap devices */
|
||||
|
||||
mymac.type = SUBNET_MAC;
|
||||
mymac.net.mac.address.x[0] = 0xfe;
|
||||
mymac.net.mac.address.x[1] = 0xfd;
|
||||
mymac.net.mac.address.x[2] = 0x00;
|
||||
mymac.net.mac.address.x[3] = 0x00;
|
||||
mymac.net.mac.address.x[4] = 0x00;
|
||||
mymac.net.mac.address.x[5] = 0x00;
|
||||
mymac.type = SUBNET_MAC;
|
||||
mymac.net.mac.address.x[0] = 0xfe;
|
||||
mymac.net.mac.address.x[1] = 0xfd;
|
||||
mymac.net.mac.address.x[2] = 0x00;
|
||||
mymac.net.mac.address.x[3] = 0x00;
|
||||
mymac.net.mac.address.x[4] = 0x00;
|
||||
mymac.net.mac.address.x[5] = 0x00;
|
||||
|
||||
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
|
||||
cp
|
||||
return 0;
|
||||
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
|
||||
cp return 0;
|
||||
}
|
||||
|
||||
void close_device(void)
|
||||
{
|
||||
cp
|
||||
close(device_fd);
|
||||
cp close(device_fd);
|
||||
}
|
||||
|
||||
int read_packet(vpn_packet_t *packet)
|
||||
int read_packet(vpn_packet_t * packet)
|
||||
{
|
||||
int lenin;
|
||||
cp
|
||||
if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0)
|
||||
{
|
||||
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
int lenin;
|
||||
cp if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
|
||||
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
|
||||
device, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(packet->data, mymac.net.mac.address.x, 6);
|
||||
memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
|
||||
packet->data[12] = 0x08;
|
||||
packet->data[13] = 0x00;
|
||||
memcpy(packet->data, mymac.net.mac.address.x, 6);
|
||||
memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
|
||||
packet->data[12] = 0x08;
|
||||
packet->data[13] = 0x00;
|
||||
|
||||
packet->len = lenin + 14;
|
||||
packet->len = lenin + 14;
|
||||
|
||||
device_total_in += packet->len;
|
||||
device_total_in += packet->len;
|
||||
|
||||
if(debug_lvl >= DEBUG_TRAFFIC)
|
||||
{
|
||||
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
|
||||
}
|
||||
if(debug_lvl >= DEBUG_TRAFFIC) {
|
||||
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
|
||||
device_info);
|
||||
}
|
||||
|
||||
return 0;
|
||||
cp
|
||||
}
|
||||
return 0;
|
||||
cp}
|
||||
|
||||
int write_packet(vpn_packet_t *packet)
|
||||
int write_packet(vpn_packet_t * packet)
|
||||
{
|
||||
cp
|
||||
if(debug_lvl >= DEBUG_TRAFFIC)
|
||||
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
|
||||
packet->len, device_info);
|
||||
cp if(debug_lvl >= DEBUG_TRAFFIC)
|
||||
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
|
||||
packet->len, device_info);
|
||||
|
||||
if(write(device_fd, packet->data + 14, packet->len - 14) < 0)
|
||||
{
|
||||
syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, packet->len, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
|
||||
syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, packet->len,
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
device_total_out += packet->len;
|
||||
cp
|
||||
return 0;
|
||||
device_total_out += packet->len;
|
||||
cp return 0;
|
||||
}
|
||||
|
||||
void dump_device_stats(void)
|
||||
{
|
||||
cp
|
||||
syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
|
||||
syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
|
||||
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
|
||||
cp
|
||||
}
|
||||
cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
|
||||
syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
|
||||
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
|
||||
cp}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue