From f4a14532cb859597db4df20be252fb31500e6650 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Mon, 8 Nov 2010 19:26:38 +0100
Subject: [PATCH] Meer debugging

---
 Connector_RTMP/main.cpp | 2 +-
 util/ddv_socket.cpp     | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Connector_RTMP/main.cpp b/Connector_RTMP/main.cpp
index 5e0c1ad6..ad38fefe 100644
--- a/Connector_RTMP/main.cpp
+++ b/Connector_RTMP/main.cpp
@@ -112,7 +112,7 @@ int main(int argc, char ** argv){
     if (ready4data){
       if (!inited){
         //we are ready, connect the socket!
-        ss = DDV_OpenUnix(streamname.c_str());
+        ss = DDV_OpenUnix(streamname);
         if (ss <= 0){
           #ifdef DEBUG
           fprintf(stderr, "Could not connect to server!\n");
diff --git a/util/ddv_socket.cpp b/util/ddv_socket.cpp
index 56bfd210..610c1cc8 100644
--- a/util/ddv_socket.cpp
+++ b/util/ddv_socket.cpp
@@ -1,3 +1,4 @@
+#include <string>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -11,12 +12,12 @@
 bool socketError = false;
 bool socketBlocking = false;
 
-int DDV_OpenUnix(const char adres[], bool nonblock = false){
+int DDV_OpenUnix(std::string adres, bool nonblock = false){
   int s = socket(AF_UNIX, SOCK_STREAM, 0);
-  struct sockaddr_un addr;
+  sockaddr_un addr;
   addr.sun_family = AF_UNIX;
-  strcpy(addr.sun_path, adres);
-  int r = connect(s, (sockaddr*)&addr, sizeof(struct sockaddr_un));
+  strncpy(addr.sun_path, adres.c_str(), adres.size()+1);
+  int r = connect(s, (sockaddr*)&addr, sizeof(addr));
   if (r == 0){
     if (nonblock){
       int flags = fcntl(s, F_GETFL, 0);