summaryrefslogtreecommitdiffstats
path: root/customdhcpcd/src
diff options
context:
space:
mode:
authorNiklas2011-10-05 17:39:35 +0200
committerNiklas2011-10-05 17:39:35 +0200
commitbe915d3cfcc639d6303bf8bc0e5ad825e0ef2f95 (patch)
treec52ed62bb40ad926271f0637f9a29aee2889543c /customdhcpcd/src
parenttried to solve the timing problem. but failed. it is also enough to test for ... (diff)
downloadfbgui-be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95.tar.gz
fbgui-be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95.tar.xz
fbgui-be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95.zip
modified the check for carrier signal. on autoUp==true: if no interface is in running state, the app will check the state of the interface several times (can be specified by us with the _ifUpCountdown value)
Diffstat (limited to 'customdhcpcd/src')
-rw-r--r--customdhcpcd/src/dhcpcd.h6
-rw-r--r--customdhcpcd/src/logwriter.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/customdhcpcd/src/dhcpcd.h b/customdhcpcd/src/dhcpcd.h
index 3f4c085..c8df616 100644
--- a/customdhcpcd/src/dhcpcd.h
+++ b/customdhcpcd/src/dhcpcd.h
@@ -37,13 +37,15 @@
#include "common.h"
+#include "../../common/fbgui.h"
+
#define DEFAULT_TIMEOUT 20
#define DEFAULT_LEASETIME 3600 /* 1 hour */
/* added by Niklas Goby, additional field, storing the socket address path for
* communicating with Qt "server" */
-#define DEFAULT_QTSOCKETADDRESS "/var/tmp/qt_c_socket_default"
-#define DEFAULT_GATEWAY_INFO_LOCATION "/var/tmp/gateways_"
+
+
#define QTSOCKETADDRESSLENGTH 255
#define CLASS_ID_MAX_LEN 48
diff --git a/customdhcpcd/src/logwriter.c b/customdhcpcd/src/logwriter.c
index d41bbfb..1e34947 100644
--- a/customdhcpcd/src/logwriter.c
+++ b/customdhcpcd/src/logwriter.c
@@ -197,7 +197,7 @@ void logGatewayToFile(const interface_t *iface, const dhcp_t *dhcp) {
route_t *route;
char path[QTSOCKETADDRESSLENGTH];
- strcpy(path, DEFAULT_GATEWAY_INFO_LOCATION);
+ strcpy(path, DEFAULT_INTERFACE_CONF_LOCATION);
strcat(path, iface->name);
syslog(LOG_INFO, "[fbgui] try to open file: %s", path);