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

Merge pull request #3386 from sigiesec/remove-locale-dependency

Browse Source 
Problem: tcp address strings are dependent on locale
This commit is contained in:
Luca Boccassi 2019-02-05 13:18:26 +00:00 committed by GitHub
commit 69a6522741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/tcp_address.cpp
View File

@ -29,7 +29,6 @@
#include "precompiled.hpp" #include "precompiled.hpp"
#include <string> #include <string>
#include <sstream>
#include "macros.hpp" #include "macros.hpp"
#include "tcp_address.hpp" #include "tcp_address.hpp"
@ -113,6 +112,27 @@ int zmq::tcp_address_t::resolve (const char *name_, bool local_, bool ipv6_)
return resolver.resolve (&_address, name_); return resolver.resolve (&_address, name_);
} }
template <size_t N1, size_t N2>
static std::string make_address_string (const char *hbuf,
uint16_t port,
const char (&ipv6_prefix)[N1],
const char (&ipv6_suffix)[N2])
{
const size_t max_port_str_length = 5;
char buf[NI_MAXHOST + sizeof ipv6_prefix + sizeof ipv6_suffix
+ max_port_str_length];
char *pos = buf;
memcpy (pos, ipv6_prefix, sizeof ipv6_prefix - 1);
pos += sizeof ipv6_prefix - 1;
const int hbuf_len = strlen (hbuf);
memcpy (pos, hbuf, hbuf_len);
pos += hbuf_len;
memcpy (pos, ipv6_suffix, sizeof ipv6_suffix - 1);
pos += sizeof ipv6_suffix - 1;
pos += sprintf (pos, "%d", ntohs (port));
return std::string (buf, pos - buf);
}
int zmq::tcp_address_t::to_string (std::string &addr_) const int zmq::tcp_address_t::to_string (std::string &addr_) const
{ {
if (_address.family () != AF_INET && _address.family () != AF_INET6) { if (_address.family () != AF_INET && _address.family () != AF_INET6) {
@ -130,14 +150,16 @@ int zmq::tcp_address_t::to_string (std::string &addr_) const
return rc; return rc;
} }
const char ipv4_prefix[] = "tcp://";
const char ipv4_suffix[] = ":";
const char ipv6_prefix[] = "tcp://[";
const char ipv6_suffix[] = "]:";
if (_address.family () == AF_INET6) { if (_address.family () == AF_INET6) {
std::stringstream s; addr_ = make_address_string (hbuf, _address.ipv6.sin6_port, ipv6_prefix,
s << "tcp://[" << hbuf << "]:" << ntohs (_address.ipv6.sin6_port); ipv6_suffix);
addr_ = s.str ();
} else { } else {
std::stringstream s; addr_ = make_address_string (hbuf, _address.ipv4.sin_port, ipv4_prefix,
s << "tcp://" << hbuf << ":" << ntohs (_address.ipv4.sin_port); ipv4_suffix);
addr_ = s.str ();
} }
return 0; return 0;
} }
@ -263,15 +285,29 @@ int zmq::tcp_address_mask_t::to_string (std::string &addr_) const
return rc; return rc;
} }
const size_t max_mask_len = 4;
const char ipv6_prefix[] = "[";
const char ipv6_suffix[] = "]/";
const char ipv4_suffix[] = "/";
char
buf[NI_MAXHOST + sizeof ipv6_prefix + sizeof ipv6_suffix + max_mask_len];
char *pos = buf;
if (_network_address.family () == AF_INET6) { if (_network_address.family () == AF_INET6) {
std::stringstream s; memcpy (pos, ipv6_prefix, sizeof ipv6_prefix - 1);
s << "[" << hbuf << "]/" << _address_mask; pos += sizeof ipv6_prefix - 1;
addr_ = s.str ();
} else {
std::stringstream s;
s << hbuf << "/" << _address_mask;
addr_ = s.str ();
} }
const int hbuf_len = strlen (hbuf);
memcpy (pos, hbuf, hbuf_len);
pos += hbuf_len;
if (_network_address.family () == AF_INET6) {
memcpy (pos, ipv6_suffix, sizeof ipv6_suffix - 1);
pos += sizeof ipv6_suffix - 1;
} else {
memcpy (pos, ipv4_suffix, sizeof ipv4_suffix - 1);
pos += sizeof ipv4_suffix - 1;
}
pos += sprintf (pos, "%d", _address_mask);
addr_.assign (buf, pos - buf);
return 0; return 0;
} }