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.4 2002/06/21 10:11:36 guus Exp $
+ $Id: device.c,v 1.1.2.9 2003/07/06 22:11:35 guus Exp $
*/
#include "config.h"
#include <fcntl.h>
#include <net/if.h>
#include <unistd.h>
-#include <syslog.h>
#include <string.h>
#include <utils.h>
#include "conf.h"
#include "net.h"
-#include "subnet.h"
+#include "logger.h"
#include "system.h"
int device_total_in = 0;
int device_total_out = 0;
-extern subnet_t mymac;
-
/*
open the local ethertap device
*/
int setup_device(void)
{
- if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- device = DEFAULT_DEVICE;
-
- if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
- interface = rindex(device, '/')?rindex(device, '/')+1: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
- /* 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;
-
- device_info = _("NetBSD tun device");
-
- syslog(LOG_INFO, _("%s is a %s"), device, device_info);
-cp
- return 0;
+ cp();
+
+ if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+ device = DEFAULT_DEVICE;
+
+ if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+ interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+ if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
+ logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+ return -1;
+ }
+
+ device_info = _("NetBSD tun device");
+
+ logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info);
+
+ return 0;
}
void close_device(void)
{
-cp
- close(device_fd);
-cp
+ cp();
+
+ close(device_fd);
}
int read_packet(vpn_packet_t *packet)
{
- int lenin;
-cp
+ 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;
- }
+ if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+ logger(DEBUG_ALWAYS, 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;
+ 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);
- }
+ logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+ device_info);
+ }
- return 0;
-cp
+ return 0;
}
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);
-
- if(write(device_fd, packet->data + 14, packet->len - 14) < 0)
- {
- syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
-
- device_total_out += packet->len;
-cp
+ cp();
+
+ logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+ packet->len, device_info);
+
+ if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
+ logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+ strerror(errno));
+ return -1;
+ }
+
+ device_total_out += packet->len;
}
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();
+
+ logger(DEBUG_ALWAYS, LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
+ logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
+ logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
}