Net::Connection-Klasse zur besseren Strukturierung gekapselt

8 files changed, 9 insertions, 10 deletions

diff --git a/src/Common/Requests/DisconnectRequest.cpp b/src/Common/Requests/DisconnectRequest.cpp
index ec8719d..248f8b1 100644
--- a/src/Common/Requests/DisconnectRequest.cpp
+++ b/src/Common/Requests/DisconnectRequest.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "DisconnectRequest.h"
-#include <Net/Connection.h>
 
 namespace Mad {
 namespace Common {
diff --git a/src/Common/Requests/DisconnectRequest.h b/src/Common/Requests/DisconnectRequest.h
index 22ff16b..b4fd4db 100644
--- a/src/Common/Requests/DisconnectRequest.h
+++ b/src/Common/Requests/DisconnectRequest.h
@@ -32,7 +32,7 @@ class DisconnectRequest : public Request {
     virtual void handlePacket(const XmlPacket &packet);
 
   public:
-    DisconnectRequest(Net::Connection *connection, uint16_t requestId, slot_type slot)
+    DisconnectRequest(Connection *connection, uint16_t requestId, slot_type slot)
     : Request(connection, requestId, slot) {}
 };
 
diff --git a/src/Common/Requests/FSInfoRequest.h b/src/Common/Requests/FSInfoRequest.h
index 285f662..1db7753 100644
--- a/src/Common/Requests/FSInfoRequest.h
+++ b/src/Common/Requests/FSInfoRequest.h
@@ -28,7 +28,7 @@ namespace Requests {
 
 class FSInfoRequest : public SimpleRequest {
   public:
-    FSInfoRequest(Net::Connection *connection, uint16_t requestId, slot_type slot)
+    FSInfoRequest(Connection *connection, uint16_t requestId, slot_type slot)
     : SimpleRequest(connection, requestId, slot, "FSInfo") {}
 };
 
diff --git a/src/Common/Requests/GSSAPIAuthRequest.cpp b/src/Common/Requests/GSSAPIAuthRequest.cpp
index 07e516f..f10bf9b 100644
--- a/src/Common/Requests/GSSAPIAuthRequest.cpp
+++ b/src/Common/Requests/GSSAPIAuthRequest.cpp
@@ -19,7 +19,6 @@
 
 #include "GSSAPIAuthRequest.h"
 #include "../Logger.h"
-#include <Net/Connection.h>
 
 #include <cstring>
 
@@ -127,10 +126,11 @@ void GSSAPIAuthRequest::handlePacket(const XmlPacket &packet) {
     recvBuffer.value = std::malloc(recvBuffer.length);
     std::memcpy(recvBuffer.value, pkgData, recvBuffer.length);
 
-    const gnutls_datum_t *cert = getConnection()->getPeerCertificate();
+    /*const gnutls_datum_t *cert = getConnection()->getPeerCertificate();
 
     sendBuffer.length = cert->size;
-    sendBuffer.value = cert->data;
+    sendBuffer.value = cert->data;*/
+    sendBuffer.value = getConnection()->getPeerCertificate(&sendBuffer.length);
 
     majStat = gss_verify_mic(&minStat, gssContext, &sendBuffer, &recvBuffer, 0);
 
diff --git a/src/Common/Requests/GSSAPIAuthRequest.h b/src/Common/Requests/GSSAPIAuthRequest.h
index 104af0c..a4f8c43 100644
--- a/src/Common/Requests/GSSAPIAuthRequest.h
+++ b/src/Common/Requests/GSSAPIAuthRequest.h
@@ -42,7 +42,7 @@ class GSSAPIAuthRequest : public Request {
     virtual void handlePacket(const XmlPacket &packet);
 
   public:
-    GSSAPIAuthRequest(Net::Connection *connection, uint16_t requestId, slot_type slot, const std::string &serviceName0)
+    GSSAPIAuthRequest(Connection *connection, uint16_t requestId, slot_type slot, const std::string &serviceName0)
         : Request(connection, requestId, slot), serviceName(serviceName0), gssServiceName(GSS_C_NO_NAME), gssContext(GSS_C_NO_CONTEXT), gssContinue(true) {}
     virtual ~GSSAPIAuthRequest();
 };
diff --git a/src/Common/Requests/SimpleRequest.h b/src/Common/Requests/SimpleRequest.h
index ca95eca..2c3070a 100644
--- a/src/Common/Requests/SimpleRequest.h
+++ b/src/Common/Requests/SimpleRequest.h
@@ -34,7 +34,7 @@ class SimpleRequest : public Request {
 
     virtual void sendRequest();
 
-    SimpleRequest(Net::Connection *connection, uint16_t requestId, slot_type slot, const std::string &type0)
+    SimpleRequest(Connection *connection, uint16_t requestId, slot_type slot, const std::string &type0)
     : Request(connection, requestId, slot), type(type0) {}
 };
 
diff --git a/src/Common/Requests/StatusRequest.h b/src/Common/Requests/StatusRequest.h
index ad89ec4..0663fc4 100644
--- a/src/Common/Requests/StatusRequest.h
+++ b/src/Common/Requests/StatusRequest.h
@@ -28,7 +28,7 @@ namespace Requests {
 
 class StatusRequest : public SimpleRequest {
   public:
-    StatusRequest(Net::Connection *connection, uint16_t requestId, slot_type slot)
+    StatusRequest(Connection *connection, uint16_t requestId, slot_type slot)
     : SimpleRequest(connection, requestId, slot, "GetStatus") {}
 };
 
diff --git a/src/Common/Requests/UserListRequest.h b/src/Common/Requests/UserListRequest.h
index 69b0f05..7ab3ec7 100644
--- a/src/Common/Requests/UserListRequest.h
+++ b/src/Common/Requests/UserListRequest.h
@@ -28,7 +28,7 @@ namespace Requests {
 
 class UserListRequest : public SimpleRequest {
   public:
-    UserListRequest(Net::Connection *connection, uint16_t requestId, slot_type slot)
+    UserListRequest(Connection *connection, uint16_t requestId, slot_type slot)
     : SimpleRequest(connection, requestId, slot, "ListUsers") {}
 };