j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use bools and enums where appropriate.

Browse source
This commit is contained in:
Guus Sliepen 2003-07-22 20:55:21 +00:00
parent 471308e163
commit eefa28059a
40 changed files with 767 additions and 765 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/raw_socket/device.c
View file

@ -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.7 2003/07/12 17:41:48 guus Exp $
$Id: device.c,v 1.1.2.8 2003/07/22 20:55:21 guus Exp $
*/
#include "config.h"
@ -43,7 +43,6 @@
#include "system.h"
int device_fd = -1;
int device_type;
char *device;
char *interface;
char ifrname[IFNAMSIZ];
@ -52,7 +51,7 @@ char *device_info;
int device_total_in = 0;
int device_total_out = 0;
int setup_device(void)
bool setup_device(void)
{
struct ifreq ifr;
struct sockaddr_ll sa;
@ -71,7 +70,7 @@ int setup_device(void)
if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
logger(LOG_ERR, _("Could not open %s: %s"), device_info,
strerror(errno));
return -1;
return false;
}
memset(&ifr, 0, sizeof(ifr));
@ -80,7 +79,7 @@ int setup_device(void)
close(device_fd);
logger(LOG_ERR, _("Can't find interface %s: %s"), interface,
strerror(errno));
return -1;
return false;
}
memset(&sa, '0', sizeof(sa));
@ -90,12 +89,12 @@ int setup_device(void)
if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
logger(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
return -1;
return false;
}
logger(LOG_INFO, _("%s is a %s"), device, device_info);
return 0;
return true;
}
void close_device(void)
@ -105,7 +104,7 @@ void close_device(void)
close(device_fd);
}
int read_packet(vpn_packet_t *packet)
bool read_packet(vpn_packet_t *packet)
{
int lenin;
@ -114,7 +113,7 @@ int read_packet(vpn_packet_t *packet)
if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return -1;
return false;
}
packet->len = lenin;
@ -125,10 +124,10 @@ int read_packet(vpn_packet_t *packet)
device_info);
}
return 0;
return true;
}
int write_packet(vpn_packet_t *packet)
bool write_packet(vpn_packet_t *packet)
{
cp();
@ -138,12 +137,12 @@ int write_packet(vpn_packet_t *packet)
if(write(device_fd, packet->data, packet->len) < 0) {
logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
strerror(errno));
return -1;
return false;
}
device_total_out += packet->len;
return 0;
return true;
}
void dump_device_stats(void)