generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-12 03:07:53 +01:00
Code Issues Projects Releases Wiki Activity

Moving to std::string in options

Browse Source
This commit is contained in:
Ian Barber
2012-02-14 23:10:06 +00:00
parent 770f84331f
commit b5d3373905
8 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tcp_listener.cpp
View File

@@ -22,6 +22,7 @@
#include <new>
#include <string.h>
#include <sstream>
#include "platform.hpp"
#include "tcp_listener.hpp"
@@ -119,11 +120,12 @@ void zmq::tcp_listener_t::close ()
s = retired_fd;
}
int zmq::tcp_listener_t::get_address (unsigned char *addr, size_t *len)
int zmq::tcp_listener_t::get_address (std::string *addr_)
{
struct sockaddr sa;
char host[INET6_ADDRSTRLEN];
int port, rc;
std::stringstream portnum;
// Get the details of the TCP socket
socklen_t sl = sizeof(sockaddr);
@@ -136,15 +138,17 @@ int zmq::tcp_listener_t::get_address (unsigned char *addr, size_t *len)
if ( sa.sa_family == AF_INET ) {
inet_ntop(AF_INET, &(((struct sockaddr_in *)&sa)->sin_addr), host, INET6_ADDRSTRLEN);
port = ntohs( ((struct sockaddr_in *)&sa)->sin_port);
portnum << port;
// Store the address for retrieval by users using wildcards
*len = sprintf((char *)addr, "tcp://%s:%d", host, port);
*addr_ = std::string("tcp://") + std::string(host) + std::string(":") + portnum.str();
} else {
inet_ntop(AF_INET6, &(((struct sockaddr_in6 *)&sa)->sin6_addr), host, INET6_ADDRSTRLEN);
port = ntohs( ((struct sockaddr_in6 *)&sa)->sin6_port);
portnum << port;
// Store the address for retrieval by users using wildcards
*len = sprintf((char *)*addr, "tcp://[%s]:%d", host, port);
*addr_ = std::string("tcp://[") + std::string(host) + std::string("]:") + portnum.str();
}
return 0;