summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Common/Request/GSSAPIAuthRequest.h (renamed from src/Common/Request/CertificateRequest.h)22
-rw-r--r--src/Common/Request/IdentifyRequest.h4
-rw-r--r--src/Common/Request/Makefile.am2
-rw-r--r--src/Common/Request/Makefile.in2
-rw-r--r--src/Common/RequestManager.cpp4
-rw-r--r--src/Core/ConnectionManager.cpp4
-rw-r--r--src/Core/RequestHandler/GSSAPIAuthRequestHandler.h (renamed from src/Core/RequestHandler/CertificateRequestHandler.h)18
-rw-r--r--src/Core/RequestHandler/Makefile.am2
-rw-r--r--src/Core/RequestHandler/Makefile.in2
-rw-r--r--src/Net/Packet.h2
-rw-r--r--src/madc.cpp4
11 files changed, 33 insertions, 33 deletions
diff --git a/src/Common/Request/CertificateRequest.h b/src/Common/Request/GSSAPIAuthRequest.h
index 4e26041..51ab0f8 100644
--- a/src/Common/Request/CertificateRequest.h
+++ b/src/Common/Request/GSSAPIAuthRequest.h
@@ -1,5 +1,5 @@
/*
- * CertificateRequest.h
+ * GSSAPIAuthRequest.h
*
* Copyright (C) 2008 Matthias Schiffer <matthias@gamezock.de>
*
@@ -17,8 +17,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MAD_COMMON_REQUEST_CERTIFICATEREQUEST_H_
-#define MAD_COMMON_REQUEST_CERTIFICATEREQUEST_H_
+#ifndef MAD_COMMON_REQUEST_GSSAPIAUTHREQUEST_H_
+#define MAD_COMMON_REQUEST_GSSAPIAUTHREQUEST_H_
#include "Request.h"
#include "../RequestManager.h"
@@ -37,7 +37,7 @@ namespace Request {
// TODO Logging & error handling!
-class CertificateRequest : public Request {
+class GSSAPIAuthRequest : public Request {
private:
std::string serviceName;
gss_name_t gssServiceName;
@@ -45,10 +45,10 @@ class CertificateRequest : public Request {
bool gssContinue;
- CertificateRequest(const std::string &serviceName0) : serviceName(serviceName0), gssServiceName(GSS_C_NO_NAME), gssContext(GSS_C_NO_CONTEXT), gssContinue(true) {}
+ GSSAPIAuthRequest(const std::string &serviceName0) : serviceName(serviceName0), gssServiceName(GSS_C_NO_NAME), gssContext(GSS_C_NO_CONTEXT), gssContinue(true) {}
public:
- virtual ~CertificateRequest() {
+ virtual ~GSSAPIAuthRequest() {
OM_uint32 minStat;
if(gssServiceName != GSS_C_NO_NAME)
@@ -56,7 +56,7 @@ class CertificateRequest : public Request {
}
static bool send(Net::Connection *connection, RequestManager &requestManager, const std::string &serviceName0) {
- CertificateRequest *request = new CertificateRequest(serviceName0);
+ GSSAPIAuthRequest *request = new GSSAPIAuthRequest(serviceName0);
if(requestManager.sendRequest(connection, request))
return true;
@@ -97,7 +97,7 @@ class CertificateRequest : public Request {
return false;
}
- if(!connection->send(Net::Packet(Net::Packet::TYPE_CERT_REQ, requestId, buffer.value, buffer.length))) {
+ if(!connection->send(Net::Packet(Net::Packet::TYPE_GSSAPI_AUTH, requestId, buffer.value, buffer.length))) {
gss_release_buffer(&minStat, &buffer);
return false;
}
@@ -112,7 +112,7 @@ class CertificateRequest : public Request {
if(isFinished())
return false;
- if(packet.getType() != Net::Packet::TYPE_CERT_REP)
+ if(packet.getType() != Net::Packet::TYPE_GSSAPI_AUTH)
return false; // TODO Logging
OM_uint32 majStat, minStat;
@@ -137,7 +137,7 @@ class CertificateRequest : public Request {
return false;
}
- if(!connection->send(Net::Packet(Net::Packet::TYPE_CERT_REQ, packet.getRequestId(), sendBuffer.value, sendBuffer.length))) {
+ if(!connection->send(Net::Packet(Net::Packet::TYPE_GSSAPI_AUTH, packet.getRequestId(), sendBuffer.value, sendBuffer.length))) {
gss_release_buffer(&minStat, &sendBuffer);
return false;
}
@@ -160,4 +160,4 @@ class CertificateRequest : public Request {
}
-#endif /* MAD_COMMON_REQUEST_CERTIFICATEREQUEST_H_ */
+#endif /* MAD_COMMON_REQUEST_GSSAPIAUTHREQUEST_H_ */
diff --git a/src/Common/Request/IdentifyRequest.h b/src/Common/Request/IdentifyRequest.h
index bb98bad..e88ce4b 100644
--- a/src/Common/Request/IdentifyRequest.h
+++ b/src/Common/Request/IdentifyRequest.h
@@ -53,7 +53,7 @@ class IdentifyRequest: public Request {
if(isSent())
return false;
- if(!connection->send(Net::Packet(Net::Packet::TYPE_IDENTIFY_REQ, requestId, hostname.c_str(), hostname.length())))
+ if(!connection->send(Net::Packet(Net::Packet::TYPE_IDENTIFY, requestId, hostname.c_str(), hostname.length())))
return false;
setSent();
@@ -64,7 +64,7 @@ class IdentifyRequest: public Request {
if(isFinished())
return false;
- if(packet.getType() != Net::Packet::TYPE_IDENTIFY_REP)
+ if(packet.getType() != Net::Packet::TYPE_IDENTIFY)
return false; // TODO Logging
std::cout << "Identified as '" << hostname << "'." << std::endl;
diff --git a/src/Common/Request/Makefile.am b/src/Common/Request/Makefile.am
index 6d54206..64c5078 100644
--- a/src/Common/Request/Makefile.am
+++ b/src/Common/Request/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = CertificateRequest.h DisconnectRequest.h IdentifyRequest.h Request.h
+noinst_HEADERS = DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h
diff --git a/src/Common/Request/Makefile.in b/src/Common/Request/Makefile.in
index 0b1006d..bf7652c 100644
--- a/src/Common/Request/Makefile.in
+++ b/src/Common/Request/Makefile.in
@@ -162,7 +162,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-noinst_HEADERS = CertificateRequest.h DisconnectRequest.h IdentifyRequest.h Request.h
+noinst_HEADERS = DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h
all: all-am
.SUFFIXES:
diff --git a/src/Common/RequestManager.cpp b/src/Common/RequestManager.cpp
index f8da7dd..82fc1af 100644
--- a/src/Common/RequestManager.cpp
+++ b/src/Common/RequestManager.cpp
@@ -66,10 +66,10 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack
connection->send(Net::Packet(Net::Packet::TYPE_OK, packet.getRequestId()));
connection->disconnect();
break;
- case Net::Packet::TYPE_IDENTIFY_REQ:
+ case Net::Packet::TYPE_IDENTIFY:
std::cout << "Received identify request from '" << std::string((char*)packet.getData(), packet.getLength()) << "'." << std::endl;
- connection->send(Net::Packet(Net::Packet::TYPE_IDENTIFY_REP, packet.getRequestId(), packet.getData(), packet.getLength()));
+ connection->send(Net::Packet(Net::Packet::TYPE_IDENTIFY, packet.getRequestId(), packet.getData(), packet.getLength()));
break;
default:
std::cerr << "Received an unexpected packet." << std::endl;
diff --git a/src/Core/ConnectionManager.cpp b/src/Core/ConnectionManager.cpp
index 62eed53..2b7c8d1 100644
--- a/src/Core/ConnectionManager.cpp
+++ b/src/Core/ConnectionManager.cpp
@@ -19,7 +19,7 @@
#include "ConnectionManager.h"
#include "ConfigManager.h"
-#include "RequestHandler/CertificateRequestHandler.h"
+#include "RequestHandler/GSSAPIAuthRequestHandler.h"
#include <Net/ServerConnection.h>
#include <Net/Packet.h>
#include <Net/Listener.h>
@@ -53,7 +53,7 @@ void ConnectionManager::refreshPollfds() {
}
ConnectionManager::ConnectionManager(const ConfigManager& configManager) : requestManager(true) {
- requestManager.registerPacketType<RequestHandler::CertificateRequestHandler>(Net::Packet::TYPE_CERT_REQ);
+ requestManager.registerPacketType<RequestHandler::GSSAPIAuthRequestHandler>(Net::Packet::TYPE_GSSAPI_AUTH);
const std::vector<Net::IPAddress> &listenerAddresses = configManager.getListenerAddresses();
diff --git a/src/Core/RequestHandler/CertificateRequestHandler.h b/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h
index b524ecd..204af6f 100644
--- a/src/Core/RequestHandler/CertificateRequestHandler.h
+++ b/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h
@@ -1,7 +1,7 @@
/*
- * CertificateRequestHandler.h
+ * GSSAPIAuthRequestHandler.h
*
- * Copyright (C) 2008 Matthias Schiffer
+ * Copyright (C) 2008 Matthias Schiffer <matthias@gamezock.de>
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -17,8 +17,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MAD_CORE_REQUESTHANDLER_CERTIFICATEREQUESTHANDLER_H_
-#define MAD_CORE_REQUESTHANDLER_CERTIFICATEREQUESTHANDLER_H_
+#ifndef MAD_CORE_REQUESTHANDLER_GSSAPIAUTHREQUESTHANDLER_H_
+#define MAD_CORE_REQUESTHANDLER_GSSAPIAUTHREQUESTHANDLER_H_
#include <Common/RequestHandler.h>
#include <Net/Packet.h>
@@ -31,20 +31,20 @@ namespace Mad {
namespace Core {
namespace RequestHandler {
-class CertificateRequestHandler : public Common::RequestHandler {
+class GSSAPIAuthRequestHandler : public Common::RequestHandler {
private:
gss_ctx_id_t gssContext;
bool gssContinue;
public:
- CertificateRequestHandler() : gssContext(GSS_C_NO_CONTEXT), gssContinue(true) {}
+ GSSAPIAuthRequestHandler() : gssContext(GSS_C_NO_CONTEXT), gssContinue(true) {}
virtual bool handlePacket(Net::Connection *connection, const Net::Packet &packet) {
if(isFinished())
return false;
- if(packet.getType() != Net::Packet::TYPE_CERT_REQ)
+ if(packet.getType() != Net::Packet::TYPE_GSSAPI_AUTH)
return false; // TODO Logging
OM_uint32 majStat, minStat;
@@ -68,7 +68,7 @@ class CertificateRequestHandler : public Common::RequestHandler {
return false;
}
- if(!connection->send(Net::Packet(Net::Packet::TYPE_CERT_REP, packet.getRequestId(), sendBuffer.value, sendBuffer.length))) {
+ if(!connection->send(Net::Packet(Net::Packet::TYPE_GSSAPI_AUTH, packet.getRequestId(), sendBuffer.value, sendBuffer.length))) {
gss_release_buffer(&minStat, &sendBuffer);
return false;
}
@@ -89,4 +89,4 @@ class CertificateRequestHandler : public Common::RequestHandler {
}
}
-#endif /* MAD_CORE_REQUESTHANDLER_CERTIFICATEREQUESTHANDLER_H_ */
+#endif /* MAD_CORE_REQUESTHANDLER_GSSAPIAUTHREQUESTHANDLER_H_ */
diff --git a/src/Core/RequestHandler/Makefile.am b/src/Core/RequestHandler/Makefile.am
index c2ff8a1..9de7011 100644
--- a/src/Core/RequestHandler/Makefile.am
+++ b/src/Core/RequestHandler/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = CertificateRequestHandler.h
+noinst_HEADERS = GSSAPIAuthRequestHandler.h
diff --git a/src/Core/RequestHandler/Makefile.in b/src/Core/RequestHandler/Makefile.in
index 28714f2..d2163f0 100644
--- a/src/Core/RequestHandler/Makefile.in
+++ b/src/Core/RequestHandler/Makefile.in
@@ -162,7 +162,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-noinst_HEADERS = CertificateRequestHandler.h
+noinst_HEADERS = GSSAPIAuthRequestHandler.h
all: all-am
.SUFFIXES:
diff --git a/src/Net/Packet.h b/src/Net/Packet.h
index 08bc9be..1952e98 100644
--- a/src/Net/Packet.h
+++ b/src/Net/Packet.h
@@ -31,7 +31,7 @@ class Packet {
public:
enum Type {
TYPE_OK = 0x0000, TYPE_ERROR = 0x0001, TYPE_DISCONNECT = 0x0002,
- TYPE_CERT_REQ = 0x0010, TYPE_CERT_REP = 0x0011, TYPE_IDENTIFY_REQ = 0x0012, TYPE_IDENTIFY_REP = 0x0013
+ TYPE_GSSAPI_AUTH = 0x0010, TYPE_IDENTIFY = 0x0011
};
struct Data {
diff --git a/src/madc.cpp b/src/madc.cpp
index f08be77..43b37d3 100644
--- a/src/madc.cpp
+++ b/src/madc.cpp
@@ -21,7 +21,7 @@
#include "Net/IPAddress.h"
#include "Net/Packet.h"
#include "Common/RequestManager.h"
-#include "Common/Request/CertificateRequest.h"
+#include "Common/Request/GSSAPIAuthRequest.h"
#include "Common/Request/DisconnectRequest.h"
#include "Common/Request/IdentifyRequest.h"
#include <iostream>
@@ -45,7 +45,7 @@ int main() {
requestManager.registerConnection(connection);
Mad::Common::Request::IdentifyRequest::send(connection, requestManager, "localhost");
- Mad::Common::Request::CertificateRequest::send(connection, requestManager, "host");
+ Mad::Common::Request::GSSAPIAuthRequest::send(connection, requestManager, "host");
Mad::Common::Request::DisconnectRequest::send(connection, requestManager);
while(connection->isConnected()) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 13:14:16 +0100