Moved ProxyProtocolVersion_t to an enum class.

Author: sfeltner-godaddy

iocore/net/I_NetVConnection.h

@@ -646,10 +646,10 @@ class NetVConnection : public AnnotatedVConnection
   NetVConnection(const NetVConnection &) = delete;
   NetVConnection &operator=(const NetVConnection &) = delete;
 
-  enum ProxyProtocolVersion_t {
-    PROXY_VERSION_UNDEFINED,
-    PROXY_V1,
-    PROXY_V2,
+  enum class ProxyProtocolVersion {
+    UNDEFINED,
+    V1,
+    V2,
   };
 
   enum ProxyProtocolData_t {
@@ -695,12 +695,12 @@ class NetVConnection : public AnnotatedVConnection
   }
 
   void
-  set_proxy_protocol_version(ProxyProtocolVersion_t ver)
+  set_proxy_protocol_version(const ProxyProtocolVersion ver)
   {
     pp_info.proxy_protocol_version = ver;
   }
 
-  ProxyProtocolVersion_t
+  ProxyProtocolVersion
   get_proxy_protocol_version()
   {
     return pp_info.proxy_protocol_version;
@@ -733,7 +733,7 @@ class NetVConnection : public AnnotatedVConnection
   };
 
   typedef struct _ProxyProtocol {
-    ProxyProtocolVersion_t proxy_protocol_version = PROXY_VERSION_UNDEFINED;
+    ProxyProtocolVersion proxy_protocol_version = ProxyProtocolVersion::UNDEFINED;
     uint16_t ip_family;
     IpEndpoint src_addr;
     uint16_t src_port;

iocore/net/P_NetVConnection.h

@@ -27,7 +27,7 @@ TS_INLINE sockaddr const *
 NetVConnection::get_remote_addr()
 {
   if (!got_remote_addr) {
-    if (pp_info.proxy_protocol_version != PROXY_VERSION_UNDEFINED) {
+    if (pp_info.proxy_protocol_version != ProxyProtocolVersion::UNDEFINED) {
       set_remote_addr(get_proxy_protocol_src_addr());
     } else {
       set_remote_addr();

iocore/net/ProxyProtocol.cc

@@ -37,10 +37,12 @@ ssl_has_proxy_v1(NetVConnection *sslvc, char *buffer, int64_t *r)
       Debug("ssl", "Consuming %" PRId64 " characters of the PROXY header from %p to %p", nl + 1, buffer, nlp);
       char local_buf[PROXY_V1_CONNECTION_HEADER_LEN_MAX + 1];
       memcpy(local_buf, buffer, nl + 1);
-      memmove(buffer, buffer + nl + 1, nl + 1);
       *r -= nl + 1;
       if (*r <= 0) {
         *r = -EAGAIN;
+      } else {
+        Debug("ssl", "Moving %" PRId64 " characters remaining in the buffer from %p to %p", *r, buffer + nl + 1, buffer);
+        memmove(buffer, buffer + nl + 1, *r);
       }
       return (proxy_protov1_parse(sslvc, local_buf));
     }
@@ -58,7 +60,7 @@ http_has_proxy_v1(IOBufferReader *reader, NetVConnection *netvc)
   end    = reader->memcpy(buf, sizeof(buf), 0 /* offset */);
   nbytes = end - buf;
 
-  // Client must send at least 15 bytes to get a reasonable match.
+  // Client must send at least 4 bytes to get a reasonable match.
   if (nbytes < (long)PROXY_V1_CONNECTION_HEADER_LEN_MIN) {
     return false;
   }
@@ -135,7 +137,7 @@ proxy_protov1_parse(NetVConnection *netvc, char *buf)
     //  otherwise increment our field counter and tok another field
     //  cnt shoud never get greater than 5, but just in case...
     if (cnt >= 5) {
-      netvc->set_proxy_protocol_version(NetVConnection::PROXY_V1);
+      netvc->set_proxy_protocol_version(NetVConnection::ProxyProtocolVersion::V1);
       return true;
     } else {
       ++cnt;

proxy/http/HttpTransact.cc

@@ -5564,7 +5564,7 @@ HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet
   if (vc) {
     s->request_data.incoming_port     = vc->get_local_port();
     s->pp_info.proxy_protocol_version = vc->get_proxy_protocol_version();
-    if (s->pp_info.proxy_protocol_version != NetVConnection::PROXY_VERSION_UNDEFINED) {
+    if (s->pp_info.proxy_protocol_version != NetVConnection::ProxyProtocolVersion::UNDEFINED) {
       ats_ip_copy(s->pp_info.src_addr, vc->pp_info.src_addr);
       ats_ip_copy(s->pp_info.dst_addr, vc->pp_info.dst_addr);
     }