diff options
| -rwxr-xr-x | UnixDomainSocketServer/server | bin | 11967 -> 10209 bytes | |||
| -rw-r--r-- | UnixDomainSocketServer/server.c | 2 | ||||
| -rwxr-xr-x | customdhcpcd/src/customdhcpcd | bin | 195074 -> 175308 bytes | |||
| -rw-r--r-- | customdhcpcd/src/logwriter.c | 22 | ||||
| -rw-r--r-- | customdhcpcd/src/logwriter.h | 2 |
5 files changed, 2 insertions, 24 deletions
diff --git a/UnixDomainSocketServer/server b/UnixDomainSocketServer/server Binary files differindex d76bb91..1811a94 100755 --- a/UnixDomainSocketServer/server +++ b/UnixDomainSocketServer/server diff --git a/UnixDomainSocketServer/server.c b/UnixDomainSocketServer/server.c index 28de223..ce776b1 100644 --- a/UnixDomainSocketServer/server.c +++ b/UnixDomainSocketServer/server.c @@ -1,5 +1,3 @@ -/* A simple server in the internet domain using TCP - The port number is passed as an argument */ #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/customdhcpcd/src/customdhcpcd b/customdhcpcd/src/customdhcpcd Binary files differindex 80fec08..3676699 100755 --- a/customdhcpcd/src/customdhcpcd +++ b/customdhcpcd/src/customdhcpcd diff --git a/customdhcpcd/src/logwriter.c b/customdhcpcd/src/logwriter.c index 6a04821..a96bbda 100644 --- a/customdhcpcd/src/logwriter.c +++ b/customdhcpcd/src/logwriter.c @@ -62,23 +62,6 @@ void closeQtLoggerSocket (){ close(sockfd); } -/* -void logToQt(char * status, char * substatus, char * msg) { - char * m = malloc(strlen(interfaceName) + strlen(status) + strlen(substatus) + strlen(msg) +4 ); - strcpy(m,interfaceName); - strcat(m,";"); - strcat(m,status); - strcat(m,";"); - strcat(m,substatus); - strcat(m,";"); - strcat(m,msg); - sendToQt(m); - - free(m); -} -*/ - - void sendToQt(log_msg * msg) { int n = -1; int t; @@ -107,14 +90,12 @@ void sendToQt(log_msg * msg) { if (outbuf != NULL) { n = send(sockfd, outbuf, DHCP_MESSAGE_SIZE, 0); } - //free(outbuf); syslog(LOG_INFO, "[fbgui] INFO writing to socket: [%d:%d] %s (%s)", msg->status, msg->substatus, msg->msg, msg->device); - // fflush(sockfd); + if (n <= 0) { syslog(LOG_ERR, "[fbgui] ERROR writing to socket: [%d:%d] %s (%s)", msg->status, msg->substatus, msg->msg, msg->device); - // fprintf(stdout, "ERROR writing to socket: %s", msg); } memset(ack,0,ACK_SIZE); if ((t = recv(sockfd, ack, ACK_SIZE, 0)) > 0) { @@ -126,7 +107,6 @@ void sendToQt(log_msg * msg) { else syslog(LOG_ERR, "[fbgui] ERROR Server closed"); } - //usleep(500); } void logToQt(int status, int substatus, const char * msg) { diff --git a/customdhcpcd/src/logwriter.h b/customdhcpcd/src/logwriter.h index 1e4184d..bb834cb 100644 --- a/customdhcpcd/src/logwriter.h +++ b/customdhcpcd/src/logwriter.h @@ -32,6 +32,6 @@ void logToQt(int status, int substatus, const char * msg); void logSendToQt(int type); void logLoggerToQt(int level, const char *fmt, va_list args); //void logToQt(char * status, char * substatus, char * msg); -//void logGatewayToFile(const interface_t iface, const dhcp_t dhcp); +void logGatewayToFile(const interface_t iface, const dhcp_t dhcp); #endif /* LOGWRITER_H_ */ |