X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/cd6078479123cd2cfe62df2d838633c143649edf..6af2f844f44acecd2c3d6fbb431777e1a4ce3e1f:/Server/include/plaqui/server/httpresponse.h?ds=sidebyside

diff --git a/Server/include/plaqui/server/httpresponse.h b/Server/include/plaqui/server/httpresponse.h
index 936d2a3..09ff21d 100644
--- a/Server/include/plaqui/server/httpresponse.h
+++ b/Server/include/plaqui/server/httpresponse.h
@@ -28,7 +28,9 @@
 #ifndef PLAQUI_HTTPRESPONSE_H
 #define PLAQUI_HTTPRESPONSE_H
 
-#include "httpmessage.h"
+#include "plaqui/server/httperror.h"
+#include "plaqui/server/httpmessage.h"
+#include <socket++/sockstream.h>
 #include <string>
 
 namespace PlaQui {
@@ -38,9 +40,23 @@ namespace Server {
 	/// Respuesta HTTP.
 	class HTTPResponse: public HTTPMessage {
 
+		/////////////////////////////////////////////////////////////////////
+		// Tipos.
+
+		public:
+
+			typedef enum {
+				INVALID_HTTP_RESPONSE,
+				INVALID_HTTP_VERSION,
+				INVALID_HTTP_RESPONSE_CODE,
+				MISSING_HTTP_RESPONSE_CODE
+			} Error;
+
+		/////////////////////////////////////////////////////////////////////
 		// Atributos.
 
-		protected:
+		//protected: FIXME - hacer privado con get/set?
+		public:
 
 			/// Código de estado.
 			unsigned status_code;
@@ -48,6 +64,7 @@ namespace Server {
 			/// Descripción del código (razón).
 			std::string reason;
 
+		/////////////////////////////////////////////////////////////////////
 		// Métodos.
 
 		public:
@@ -60,38 +77,38 @@ namespace Server {
 			/**
 			 * Constructor.
 			 */
-			HTTPResponse(const std::string& version = "1.1");
+			HTTPResponse(const std::string& body = "",
+					const std::string& version = "1.1");
 
 			/**
 			 * Constructor.
 			 */
-			HTTPResponse(const Serializable& body,
-					const std::string& version = "1.1");
+			HTTPResponse(const HTTPError& error);
 
 			/**
 			 * Constructor.
 			 */
-			HTTPResponse(unsigned status_code, const std::string& reason,
-					const std::string& version = "1.1");
+			HTTPResponse(unsigned status_code, const std::string& body = "");
 
 			/**
 			 * Constructor.
 			 */
-			HTTPResponse(unsigned status_code, const std::string& reason,
-					const std::string& body,
-					const std::string& version = "1.1");
+			//HTTPResponse(unsigned status_code, const std::string& reason,
+			//		const std::string& body,
+			//		const std::string& version = "1.1");
 
 			/**
 			 * Obtiene los datos de la respuesta HTTP desde un texto.
 			 */
 			friend std::istream& operator>>(std::istream& is,
-					const HTTPResponse& resp);
+					HTTPResponse& resp)
+				throw(Error, sockerr, std::ios::failure);
 
 			/**
 			 * Convierte la respuesta HTTP en texto.
 			 */
 			friend std::ostream& operator<<(std::ostream& os,
-					const HTTPResponse& resp);
+					const HTTPResponse& resp) throw(sockerr);
 
 	};