summaryrefslogtreecommitdiffstats
path: root/workspace/networkDiscovery
diff options
context:
space:
mode:
Diffstat (limited to 'workspace/networkDiscovery')
-rw-r--r--workspace/networkDiscovery/dhcpcd/logger.c59
-rw-r--r--workspace/networkDiscovery/networkdiscovery.cpp8
-rw-r--r--workspace/networkDiscovery/networkdiscovery.h3
3 files changed, 33 insertions, 37 deletions
diff --git a/workspace/networkDiscovery/dhcpcd/logger.c b/workspace/networkDiscovery/dhcpcd/logger.c
index a68fe65..ec10bb9 100644
--- a/workspace/networkDiscovery/dhcpcd/logger.c
+++ b/workspace/networkDiscovery/dhcpcd/logger.c
@@ -27,7 +27,7 @@
#define SYSLOG_NAMES
-#define COM_CH "./com_ch"
+#define COM_CH "/var/tmp/com.socket"
#include <sys/types.h>
#include <sys/socket.h>
@@ -44,7 +44,7 @@
#include "logger.h"
/*sockets for the logger and the qt-reader */
-int s, ns;
+int sockfd, ns;
static int loglevel = LOG_WARNING;
static char logprefix[12] = {0};
@@ -126,46 +126,33 @@ void logger (int level, const char *fmt, ...)
va_end (p);
}
-void initQtLoggerSocket ()
-{
- /*variables for the communication over sockets with Qt*/
- int fromlen;
- struct sockaddr_un soaddr, faddr;
- int slen;
-
- if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- perror("server: socket");
- exit(1);
- }
-
- soaddr.sun_family = AF_UNIX;
- strcpy(soaddr.sun_path, COM_CH);
- unlink(COM_CH);
- slen = strlen(soaddr.sun_path) + sizeof(soaddr.sun_family);
- if (bind(s, (struct sockaddr *) &soaddr, slen) < 0) {
- perror("server: bind");
- exit(1);
- }
-
- if (listen(s, 5) < 0) {
- perror("server: listen");
- exit(1);
- }
-
- if ((ns = accept(s, &faddr, &fromlen)) < 0) {
- perror("server: accept");
- exit(1);
- }
+void initQtLoggerSocket() {
+ /**
+ * new code. seems to be right.
+ */
+ struct sockaddr_un serv_addr;
+ sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (sockfd < 0)
+ fprintf(stdout,"ERROR opening socket");
+ serv_addr.sun_family = AF_UNIX;
+ strcpy(serv_addr.sun_path, "/var/tmp/qt_c_socket_test");
+
+ if (connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
+ fprintf(stdout,"ERROR connecting");
}
void closeQtLoggerSocket (){
close(s);
}
-void sendToQt (char *msg) {
- if(send(ns,msg, strlen(msg),0) < 0)
- {
- fprintf(stdout,"logger: failed to send message: %s", msg);
+void sendToQt(char *msg) {
+ if (send(ns, msg, strlen(msg), 0) < 0) {
+ fprintf(stdout, "logger: failed to send message: %s", msg);
}
+ //char buffer[256];
+ char *b = "test";
+ int n = write(sockfd, b, strlen(b));
+ if (n < 0)
+ fprintf(stdout, "ERROR writing to socket");
}
diff --git a/workspace/networkDiscovery/networkdiscovery.cpp b/workspace/networkDiscovery/networkdiscovery.cpp
index cf4f354..e308de4 100644
--- a/workspace/networkDiscovery/networkdiscovery.cpp
+++ b/workspace/networkDiscovery/networkdiscovery.cpp
@@ -88,9 +88,15 @@ void NetworkDiscovery::listenToLogger()
{
skt = new QLocalSocket(this);
-// connect(socket, SIGNAL(readyRead()), this, )
+ connect(skt, SIGNAL(readyRead()), this, SLOT(handleLoggedMessage()));
connect(skt, SIGNAL(error(QLocalSocket::LocalSocketError)),
this, SLOT(displayError(QLocalSocket::LocalSocketError)));
+ skt->connectToServer(COM_CH);
+}
+
+void NetworkDiscovery::handleLoggedMessage()
+{
+
}
void NetworkDiscovery::displayError(QLocalSocket::LocalSocketError socketError)
diff --git a/workspace/networkDiscovery/networkdiscovery.h b/workspace/networkDiscovery/networkdiscovery.h
index 8001bdf..fef0999 100644
--- a/workspace/networkDiscovery/networkdiscovery.h
+++ b/workspace/networkDiscovery/networkdiscovery.h
@@ -7,6 +7,8 @@
#include <qlocalsocket.h>
#include "ui_networkdiscovery.h"
+#define COM_CH "/var/tmp/com.socket"
+
class NetworkDiscovery : public QWidget
{
Q_OBJECT
@@ -16,6 +18,7 @@ public:
~NetworkDiscovery();
public slots:
+ void handleLoggedMessage();
void displayError(QLocalSocket::LocalSocketError socketError);
private: