Merge lp:~493pocbrcycmdw7yksonho9o2qzz-o18bz-d18ecat4t1b76tkfi3vttrkfngli/libmemcached/libmemcached into lp:libmemcached

[Massive Media]

Added the ability to get the local port of a memcache_instance_st.
Sometimes when you're hunting bugs on a production webserver (with multiple workers) you want to tcpdump and see what's going on.
This patch adds the memcached_server_srcport method to the library which returns the local sourceport of the connection (if there's a connection).
We use it a lot.

[lp:~493pocbrcycmdw7yksonho9o2qzz-o18bz-d18ecat4t1b76tkfi3vttrkfngli/libmemcached/libmemcached]

1174. By nicolas on 2013-11-20

Small bugfixes for errno (since memcached_quit_server() modifies errno)

=== modified file 'libmemcached-1.2/server.h'
--- libmemcached-1.2/server.h	2013-04-03 13:14:23 +0000
+++ libmemcached-1.2/server.h	2013-11-20 14:41:50 +0000
@@ -104,6 +104,9 @@
 in_port_t memcached_server_port(const memcached_instance_st * self);
 
 LIBMEMCACHED_API
+in_port_t memcached_server_srcport(const memcached_instance_st * self);
+
+LIBMEMCACHED_API
 void memcached_instance_next_retry(const memcached_instance_st * self, const time_t absolute_time);
 
 LIBMEMCACHED_API
 
=== modified file 'libmemcached/io.cc'
--- libmemcached/io.cc	2013-11-04 11:17:45 +0000
+++ libmemcached/io.cc	2013-11-20 14:41:50 +0000
@@ -342,6 +342,7 @@
     }
 
     ssize_t sent_length= ::send(instance->fd, local_write_ptr, write_length, flags);
+    int local_errno= get_socket_errno(); // We cache in case memcached_quit_server() modifies errno
 
     if (sent_length == SOCKET_ERROR)
     {
@@ -381,14 +382,14 @@
           }
 
           memcached_quit_server(instance, true);
-          error= memcached_set_errno(*instance, get_socket_errno(), MEMCACHED_AT);
+          error= memcached_set_errno(*instance, local_errno, MEMCACHED_AT);
           return false;
         }
       case ENOTCONN:
       case EPIPE:
       default:
         memcached_quit_server(instance, true);
-        error= memcached_set_errno(*instance, get_socket_errno(), MEMCACHED_AT);
+        error= memcached_set_errno(*instance, local_errno, MEMCACHED_AT);
         WATCHPOINT_ASSERT(instance->fd == INVALID_SOCKET);
         return false;
       }
@@ -422,6 +423,8 @@
   do
   {
     data_read= ::recv(instance->fd, instance->read_buffer, MEMCACHED_MAX_BUFFER, MSG_NOSIGNAL);
+    int local_errno= get_socket_errno(); // We cache in case memcached_quit_server() modifies errno
+
     if (data_read == SOCKET_ERROR)
     {
       switch (get_socket_errno())
@@ -460,7 +463,7 @@
       case ECONNREFUSED:
       default:
         memcached_quit_server(instance, true);
-        memcached_set_errno(*instance, get_socket_errno(), MEMCACHED_AT);
+        memcached_set_errno(*instance, local_errno, MEMCACHED_AT);
         break;
       }
 
 
=== modified file 'libmemcached/server.cc'
--- libmemcached/server.cc	2013-03-31 23:24:29 +0000
+++ libmemcached/server.cc	2013-11-20 14:41:50 +0000
@@ -213,6 +213,24 @@
   return self->port();
 }
 
+in_port_t memcached_server_srcport(const memcached_instance_st * self)
+{
+  WATCHPOINT_ASSERT(self);
+  if (self == NULL || self->fd == INVALID_SOCKET || (self->type != MEMCACHED_CONNECTION_TCP && self->type != MEMCACHED_CONNECTION_UDP))
+  {
+    return 0;
+  }
+
+  struct sockaddr_in sin;
+  socklen_t addrlen= sizeof(sin);
+  if (getsockname(self->fd, (struct sockaddr*)&sin, &addrlen) != -1)
+  {
+    return ntohs(sin.sin_port);
+  }
+
+  return -1;
+}
+
 uint32_t memcached_server_response_count(const memcached_instance_st * self)
 {
   WATCHPOINT_ASSERT(self);