projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace pointers to global splay trees with structs.
[tinc]
/
src
/
solaris
/
device.c
diff --git
a/src/solaris/device.c
b/src/solaris/device.c
index
9480dda
..
78bb437
100644
(file)
--- a/
src/solaris/device.c
+++ b/
src/solaris/device.c
@@
-53,12
+53,12
@@
int device_fd = -1;
static int ip_fd = -1;
char *device = NULL;
char *iface = NULL;
static int ip_fd = -1;
char *device = NULL;
char *iface = NULL;
-static char *device_info = NULL;
+static c
onst c
har *device_info = NULL;
static bool setup_device(void) {
char *type;
static bool setup_device(void) {
char *type;
- if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
+ if(!get_config_string(lookup_config(
&
config_tree, "Device"), &device)) {
if(routing_mode == RMODE_ROUTER) {
device = xstrdup(DEFAULT_TUN_DEVICE);
} else {
if(routing_mode == RMODE_ROUTER) {
device = xstrdup(DEFAULT_TUN_DEVICE);
} else {
@@
-66,7
+66,7
@@
static bool setup_device(void) {
}
}
}
}
- if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
+ if(get_config_string(lookup_config(
&
config_tree, "DeviceType"), &type)) {
if(!strcasecmp(type, "tun"))
/* use default */;
else if(!strcasecmp(type, "tap")) {
if(!strcasecmp(type, "tun"))
/* use default */;
else if(!strcasecmp(type, "tap")) {
@@
-102,9
+102,9
@@
static bool setup_device(void) {
/* Get unit number. */
char *ptr = device;
/* Get unit number. */
char *ptr = device;
- get_config_string(lookup_config(config_tree, "Interface"), &ptr);
+ get_config_string(lookup_config(
&
config_tree, "Interface"), &ptr);
- while(*ptr && !isdigit(*ptr)) {
+ while(*ptr && !isdigit(
(uint8_t)
*ptr)) {
ptr++;
}
ptr++;
}