X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f61815af20ebb943000d36ea01489f6115e4061c..27c78e4552aaefac9a4db0d4453eff09cdfef2ad:/src/common/protocol.cpp

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 1f5fb7adfd..e92f3a0899 100644
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -6,13 +6,9 @@
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "protocol.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -20,7 +16,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL
 
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
@@ -40,111 +36,177 @@
 
 wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
+           : m_protoname(name),
+             m_servname(serv)
 {
-  m_protoname = name;
-  m_servname = serv;
-  m_cinfo = info;
-  m_needhost = need_host1;
-  next = wxURL::g_protocols;
-  wxURL::g_protocols = this;
+    m_cinfo = info;
+    m_needhost = need_host1;
+#if wxUSE_URL
+    next = wxURL::ms_protocols;
+    wxURL::ms_protocols = this;
+#else
+    next = NULL;
+#endif
 }
 
 /////////////////////////////////////////////////////////////////
 // wxProtocol ///////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 
+#if wxUSE_SOCKETS
 IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxObject)
+#endif
 
 wxProtocol::wxProtocol()
+#if wxUSE_SOCKETS
  : wxSocketClient()
+#endif
 {
 }
 
+#if wxUSE_SOCKETS
 bool wxProtocol::Reconnect()
 {
-  wxIPV4address addr;
-
-  if (!GetPeer(addr)) {
-    Close();
-    return FALSE;
-  }
-  if (!Close())
-    return FALSE;
-  if (!Connect(addr))
-    return FALSE;
-  return TRUE;
+    wxIPV4address addr;
+
+    if (!GetPeer(addr))
+    {
+        Close();
+        return false;
+    }
+
+    if (!Close())
+        return false;
+
+    if (!Connect(addr))
+        return false;
+
+    return true;
 }
 
-wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
-#define PROTO_BSIZE 2048
-  size_t avail, size;
-  char tmp_buf[PROTO_BSIZE], tmp_str[PROTO_BSIZE];
-  char *ret;
-  bool found;
+// ----------------------------------------------------------------------------
+// Read a line from socket
+// ----------------------------------------------------------------------------
+
+/* static */
+wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
+{
+    static const int LINE_BUF = 4095;
+
+    result.clear();
+
+    wxCharBuffer buf(LINE_BUF);
+    char *pBuf = buf.data();
+    while ( sock->WaitForRead() )
+    {
+        // peek at the socket to see if there is a CRLF
+        sock->Peek(pBuf, LINE_BUF);
+
+        size_t nRead = sock->LastCount();
+        if ( !nRead && sock->Error() )
+            return wxPROTO_NETERR;
+
+        // look for "\r\n" paying attention to a special case: "\r\n" could
+        // have been split by buffer boundary, so check also for \r at the end
+        // of the last chunk and \n at the beginning of this one
+        pBuf[nRead] = '\0';
+        const char *eol = strchr(pBuf, '\n');
+
+        // if we found '\n', is there a '\r' as well?
+        if ( eol )
+        {
+            if ( eol == pBuf )
+            {
+                // check for case of "\r\n" being split
+                if ( result.empty() || result.Last() != _T('\r') )
+                {
+                    // ignore the stray '\n'
+                    eol = NULL;
+                }
+                //else: ok, got real EOL
+
+                // read just this '\n' and restart
+                nRead = 1;
+            }
+            else // '\n' in the middle of the buffer
+            {
+                // in any case, read everything up to and including '\n'
+                nRead = eol - pBuf + 1;
+
+                if ( eol[-1] != '\r' )
+                {
+                    // as above, simply ignore stray '\n'
+                    eol = NULL;
+                }
+            }
+        }
+
+        sock->Read(pBuf, nRead);
+        if ( sock->LastCount() != nRead )
+            return wxPROTO_NETERR;
+
+        pBuf[nRead] = '\0';
+        result += wxString::FromAscii(pBuf);
+
+        if ( eol )
+        {
+            // remove trailing "\r\n"
+            result.RemoveLast(2);
+
+            return wxPROTO_NOERR;
+        }
+    }
 
-  avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
-  if (sock->LastError() != 0 || avail == 0)
     return wxPROTO_NETERR;
+}
 
-  memcpy(tmp_str, tmp_buf, avail);
+wxProtocolError wxProtocol::ReadLine(wxString& result)
+{
+    return ReadLine(this, result);
+}
 
-// Not implemented on all systems
-// ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
-  found = FALSE;
-  for (ret=tmp_str;ret < (tmp_str+avail); ret++)
-     if (*ret == '\n') {
-       found = TRUE;
-       break;
-     }
+// old function which only chops '\n' and not '\r\n'
+wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
+{
+#define PROTO_BSIZE 2048
+    size_t avail, size;
+    char tmp_buf[PROTO_BSIZE], tmp_str[PROTO_BSIZE];
+    char *ret;
+    bool found;
 
-  if (!found)
-    return wxPROTO_PROTERR;
-  *ret = 0;
+    avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
+    if (sock->Error() || avail == 0)
+        return wxPROTO_NETERR;
 
-  result = tmp_str;
-  result = result.Left(result.Length()-1);
+    memcpy(tmp_str, tmp_buf, avail);
 
-  size = ret-tmp_str+1;
-  sock->CreatePushbackBefore(&tmp_buf[size], avail-size);
-  return wxPROTO_NOERR;
-#undef PROTO_BSIZE
-}
+    // Not implemented on all systems
+    // ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
+    found = false;
+    for (ret=tmp_str;ret < (tmp_str+avail); ret++)
+        if (*ret == '\n')
+        {
+            found = true;
+            break;
+        }
 
-// ----------------------------------------------------------------------
-// Module
-// ----------------------------------------------------------------------
+    if (!found)
+        return wxPROTO_PROTERR;
 
-class wxProtocolModule: public wxModule {
-  DECLARE_DYNAMIC_CLASS(wxProtocolModule)
-public:
-  wxProtocolModule() {}
-  bool OnInit();
-  void OnExit();
-};
+    *ret = 0;
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
-#endif
+    result = wxString::FromAscii( tmp_str );
+    result = result.Left(result.Length()-1);
 
-bool wxProtocolModule::OnInit()
-{
-  char *env_http_prox;
-
-  wxURL::g_proxy = NULL;
-  // Initialize the proxy when HTTP_PROXY is defined
-  env_http_prox = getenv("HTTP_PROXY");
-  if (env_http_prox)
-    wxURL::SetDefaultProxy(env_http_prox);
-  
-  return TRUE;
-}
+    size = ret-tmp_str+1;
+    sock->Unread(&tmp_buf[size], avail-size);
 
-void wxProtocolModule::OnExit()
-{
-  if (wxURL::g_proxy)
-    delete wxURL::g_proxy;
-  wxURL::g_proxy = NULL;
+    return wxPROTO_NOERR;
+#undef PROTO_BSIZE
 }
+#endif // wxUSE_SOCKETS
+
+#endif // wxUSE_PROTOCOL
 
-#endif
-  // wxUSE_SOCKETS