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.

diff --git a/libmemcached-1.0/server.h b/libmemcached-1.0/server.h
index 856c0e7e4416a3550f9a7111d112f7d40587cb62..abd0bfb95375d5a4152998195cef227758fe6c3e 100644 (file)
--- a/libmemcached-1.0/server.h
+++ b/libmemcached-1.0/server.h
@@ -103,6 +103,9 @@ const char *memcached_server_name(const memcached_instance_st * self);
 LIBMEMCACHED_API
 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);
 

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index b38120ad424c002b8568bb0a6bc4ff2f826f9322..c4747ddc277a3b08c2c72eeb1315b180da2c51a7 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -213,6 +213,24 @@ in_port_t memcached_server_port(const memcached_instance_st * self)
   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);