X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.cc;h=c4747ddc277a3b08c2c72eeb1315b180da2c51a7;hb=ec50b15e196594c059c2d6d9a5a7b810b714bd53;hp=27e51e96691784cab0c3281c358dd29367e54ac0;hpb=326e812b0ca940bf90aaadf69312a0316091d0cb;p=m6w6%2Flibmemcached

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index 27e51e96..c4747ddc 100644
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -191,18 +191,18 @@ uint32_t memcached_server_count(const memcached_st *self)
   return self->number_of_hosts;
 }
 
-const char *memcached_server_name(const memcached_server_instance_st self)
+const char *memcached_server_name(const memcached_instance_st * self)
 {
   WATCHPOINT_ASSERT(self);
   if (self)
   {
-    return self->hostname;
+    return self->_hostname;
   }
 
   return NULL;
 }
 
-in_port_t memcached_server_port(const memcached_server_instance_st self)
+in_port_t memcached_server_port(const memcached_instance_st * self)
 {
   WATCHPOINT_ASSERT(self);
   if (self == NULL)
@@ -213,7 +213,25 @@ in_port_t memcached_server_port(const memcached_server_instance_st self)
   return self->port();
 }
 
-uint32_t memcached_server_response_count(const memcached_server_instance_st self)
+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);
   if (self == NULL)
@@ -224,7 +242,7 @@ uint32_t memcached_server_response_count(const memcached_server_instance_st self
   return self->cursor_active_;
 }
 
-const char *memcached_server_type(const memcached_server_instance_st ptr)
+const char *memcached_server_type(const memcached_instance_st * ptr)
 {
   if (ptr)
   {
@@ -244,7 +262,7 @@ const char *memcached_server_type(const memcached_server_instance_st ptr)
   return "UNKNOWN";
 }
 
-uint8_t memcached_server_major_version(const memcached_server_instance_st instance)
+uint8_t memcached_server_major_version(const memcached_instance_st * instance)
 {
   if (instance)
   {
@@ -254,7 +272,7 @@ uint8_t memcached_server_major_version(const memcached_server_instance_st instan
   return UINT8_MAX;
 }
 
-uint8_t memcached_server_minor_version(const memcached_server_instance_st instance)
+uint8_t memcached_server_minor_version(const memcached_instance_st * instance)
 {
   if (instance)
   {
@@ -264,7 +282,7 @@ uint8_t memcached_server_minor_version(const memcached_server_instance_st instan
   return UINT8_MAX;
 }
 
-uint8_t memcached_server_micro_version(const memcached_server_instance_st instance)
+uint8_t memcached_server_micro_version(const memcached_instance_st * instance)
 {
   if (instance)
   {