[myserver-commit] [3088] Store the protocol prefix in the `Protocol' class.

[Giuseppe Scrivano]

Revision: 3088
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3088
Author:   gscrivano
Date:     2009-05-20 18:12:05 +0000 (Wed, 20 May 2009)
Log Message:
-----------
Store the protocol prefix in the `Protocol' class.

Modified Paths:
--------------
    trunk/myserver/include/protocol/http/http.h
    trunk/myserver/include/protocol/protocol.h
    trunk/myserver/src/protocol/control/control_protocol.cpp
    trunk/myserver/src/protocol/ftp/ftp.cpp
    trunk/myserver/src/protocol/protocol.cpp

Modified: trunk/myserver/include/protocol/http/http.h
===================================================================
--- trunk/myserver/include/protocol/http/http.h 2009-05-17 19:33:58 UTC (rev 
3087)
+++ trunk/myserver/include/protocol/http/http.h 2009-05-20 18:12:05 UTC (rev 
3088)
@@ -205,7 +205,6 @@
   void clean();
   void computeDigest(char*, char*);
   u_long checkDigest();
-  string protocolPrefix;
 };
 
 

Modified: trunk/myserver/include/protocol/protocol.h
===================================================================
--- trunk/myserver/include/protocol/protocol.h  2009-05-17 19:33:58 UTC (rev 
3087)
+++ trunk/myserver/include/protocol/protocol.h  2009-05-20 18:12:05 UTC (rev 
3088)
@@ -1,7 +1,7 @@
 /* -*- mode: c++ -*- */
 /*
 MyServer
-Copyright (C) 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2008, 2009 Free Software Foundation, Inc.
 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 Free Software Foundation; either version 3 of the License, or
@@ -33,15 +33,18 @@
 {
 public:
        Protocol();
-  virtual ~Protocol();
-       virtual char* registerName(char*,int len);
-       virtual int controlConnection(ConnectionPtr a, char *b1, char *b2,
-                                int bs1, int bs2, u_long nbtr, u_long id);
-       virtual int loadProtocol(XmlParser*);
-       virtual int unLoadProtocol(XmlParser*);
+  virtual ~Protocol ();
+       virtual char* registerName (char*,int len);
+       virtual int controlConnection (ConnectionPtr a, char *b1, char *b2,
+                                 int bs1, int bs2, u_long nbtr, u_long id);
+       virtual int loadProtocol (XmlParser*);
+       virtual int unLoadProtocol (XmlParser*);
 
-  virtual int getProtocolOptions(){return protocolOptions;}
+  virtual int getProtocolOptions (){return protocolOptions;}
+
+  virtual string &getProtocolPrefix (){return protocolPrefix;}
 protected:
+  string protocolPrefix;
        int protocolOptions;
 };
 #endif

Modified: trunk/myserver/src/protocol/control/control_protocol.cpp
===================================================================
--- trunk/myserver/src/protocol/control/control_protocol.cpp    2009-05-17 
19:33:58 UTC (rev 3087)
+++ trunk/myserver/src/protocol/control/control_protocol.cpp    2009-05-20 
18:12:05 UTC (rev 3088)
@@ -81,6 +81,7 @@
 ControlProtocol::ControlProtocol() 
 {
   protocolOptions = PROTOCOL_USES_SSL;
+  protocolPrefix.assign ("control://");
 }
 
 /*!

Modified: trunk/myserver/src/protocol/ftp/ftp.cpp
===================================================================
--- trunk/myserver/src/protocol/ftp/ftp.cpp     2009-05-17 19:33:58 UTC (rev 
3087)
+++ trunk/myserver/src/protocol/ftp/ftp.cpp     2009-05-20 18:12:05 UTC (rev 
3088)
@@ -310,6 +310,7 @@
 {
   m_nPassivePort = Ftp::FIRST_PASV_PORT;
   protocolOptions = PROTOCOL_FAST_CHECK | PROTOCOL_DENY_DELETE;
+  protocolPrefix.assign("ftp://";);
 }
 
 Ftp::~Ftp()

Modified: trunk/myserver/src/protocol/protocol.cpp
===================================================================
--- trunk/myserver/src/protocol/protocol.cpp    2009-05-17 19:33:58 UTC (rev 
3087)
+++ trunk/myserver/src/protocol/protocol.cpp    2009-05-20 18:12:05 UTC (rev 
3088)
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2008, 2009 Free Software Foundation, Inc.
 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 Free Software Foundation; either version 3 of the License, or
@@ -68,6 +68,7 @@
 Protocol::Protocol()
 {
   protocolOptions = 0;
+  protocolPrefix.assign ("");
 }
 
 /*!