Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added IPv6 encoding.

Browse Source 
Switched IPv4 encoding to be always in Network Order.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6732 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-09-11 07:09:30 +00:00
parent 14f99418ae
commit fd071161bf
2 changed files with 107 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
libretroshare/src/serialiser/rstlvbase.cc
View File

@ -593,12 +593,12 @@ bool SetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset,
sockaddr_in addr = *out; sockaddr_in addr = *out;
/* now add the data .... (its already in network order) - so flip */ /* now add the data .... (keep in network order) */
uint32_t ipaddr = addr.sin_addr.s_addr; uint32_t ipaddr = addr.sin_addr.s_addr;
ok &= setRawUInt32(data, tlvend, offset, ntohl(ipaddr)); ok &= setRawUInt32(data, tlvend, offset, ipaddr);
uint16_t port = addr.sin_port; uint16_t port = addr.sin_port;
ok &= setRawUInt16(data, tlvend, offset, ntohs(port)); ok &= setRawUInt16(data, tlvend, offset, port);
return ok; return ok;
} }
@ -650,16 +650,16 @@ bool GetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset,
bool ok = true; bool ok = true;
/* now get the data .... (its already in network order) - so flip */ /* now get the data .... (keep in network order) */
uint32_t ipaddr; uint32_t ipaddr;
ok &= getRawUInt32(data, tlvend, offset, &ipaddr); ok &= getRawUInt32(data, tlvend, offset, &ipaddr);
in->sin_family = AF_INET; /* set FAMILY */ in->sin_family = AF_INET; /* set FAMILY */
in->sin_addr.s_addr = htonl(ipaddr); in->sin_addr.s_addr = ipaddr;
uint16_t port; uint16_t port;
ok &= getRawUInt16(data, tlvend, offset, &port); ok &= getRawUInt16(data, tlvend, offset, &port);
in->sin_port = htons(port); in->sin_port = port;
return ok; return ok;
} }
@ -668,3 +668,100 @@ uint32_t GetTlvIpAddrPortV4Size() {
return TLV_HEADER_SIZE + 4 + 2; /* header + 4 (IP) + 2 (Port) */ return TLV_HEADER_SIZE + 4 + 2; /* header + 4 (IP) + 2 (Port) */
} }
bool SetTlvIpAddrPortV6(void *data, uint32_t size, uint32_t *offset,
uint16_t type, struct sockaddr_in6 *out) {
if (!data)
return false;
uint32_t tlvsize = GetTlvIpAddrPortV4Size();
uint32_t tlvend = *offset + tlvsize; /* where the data will extend to */
if (size < tlvend)
{
#ifdef TLV_BASE_DEBUG
std::cerr << "SetTlvIpAddrPortV6() FAILED - not enough space" << std::endl;
std::cerr << "SetTlvIpAddrPortV6() size: " << size << std::endl;
std::cerr << "SetTlvIpAddrPortV6() tlvsize: " << tlvsize << std::endl;
std::cerr << "SetTlvIpAddrPortV6() tlvend: " << tlvend << std::endl;
#endif
return false;
}
bool ok = true;
ok &= SetTlvBase(data, tlvend, offset, type, tlvsize);
/* now add the data (keep in network order) */
uint32_t *ip6addr = (uint32_t *) out->sin6_addr.s6_addr;
for(int i = 0; i < 4; i++)
{
ok &= setRawUInt32(data, tlvend, offset, ip6addr[i]);
}
ok &= setRawUInt16(data, tlvend, offset, out->sin_port6);
return ok;
}
bool GetTlvIpAddrPortV6(void *data, uint32_t size, uint32_t *offset,
uint16_t type, struct sockaddr_in6 *in) {
if (!data)
return false;
if (size < *offset + TLV_HEADER_SIZE)
{
#ifdef TLV_BASE_DEBUG
std::cerr << "GetIpAddrPortV6() FAILED - not enough space" << std::endl;
std::cerr << "GetIpAddrPortV6() size: " << size << std::endl;
std::cerr << "GetIpAddrPortV6() *offset: " << *offset << std::endl;
#endif
return false;
}
/* extract the type and size */
void *tlvstart = right_shift_void_pointer(data, *offset);
uint16_t tlvtype = GetTlvType(tlvstart);
uint32_t tlvsize = GetTlvSize(tlvstart);
/* check that there is size */
uint32_t tlvend = *offset + tlvsize;
if (size < tlvend)
{
#ifdef TLV_BASE_DEBUG
std::cerr << "GetIpAddrPortV6() FAILED - not enough space" << std::endl;
std::cerr << "GetIpAddrPortV6() size: " << size << std::endl;
std::cerr << "GetIpAddrPortV6() tlvsize: " << tlvsize << std::endl;
std::cerr << "GetIpAddrPortV6() tlvend: " << tlvend << std::endl;
#endif
return false;
}
if (type != tlvtype)
{
#ifdef TLV_BASE_DEBUG
std::cerr << "GetIpAddrPortV6() FAILED - invalid type" << std::endl;
std::cerr << "GetIpAddrPortV6() type: " << type << std::endl;
std::cerr << "GetIpAddrPortV6() tlvtype: " << tlvtype << std::endl;
#endif
return false;
}
*offset += TLV_HEADER_SIZE; /* skip header */
bool ok = true;
/* now get the data (keep in network order) */
uint32_t *ip6addr = (uint32_t *) in->sin6_addr.s6_addr;
for(int i = 0; i < 4; i++)
{
ok &= getRawUInt32(data, tlvend, offset, ip6addr[i]);
}
in->sin6_family = AF_INET6; /* set FAMILY */
ok &= getRawUInt16(data, tlvend, offset, &(in->sin6_port));
return ok;
}
uint32_t GetTlvIpAddrPortV6Size() {
return TLV_HEADER_SIZE + 16 + 2; /* header + 16 (IP) + 2 (Port) */
}

4
libretroshare/src/serialiser/rstlvbase.h
View File

@ -273,6 +273,10 @@ bool SetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset, uint16_
bool GetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset, uint16_t type, struct sockaddr_in *in); bool GetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset, uint16_t type, struct sockaddr_in *in);
uint32_t GetTlvIpAddrPortV4Size(); uint32_t GetTlvIpAddrPortV4Size();
bool SetTlvIpAddrPortV6(void *data, uint32_t size, uint32_t *offset, uint16_t type, struct sockaddr_in6 *out);
bool GetTlvIpAddrPortV6(void *data, uint32_t size, uint32_t *offset, uint16_t type, struct sockaddr_in6 *in);
uint32_t GetTlvIpAddrPortV6Size();
/* additional function to be added /* additional function to be added
bool SetTlvBinData(void* data, uint32_t size, uint32_t* offset, uint16_t type, void* data_bin, uint32_t len_tlv) bool SetTlvBinData(void* data, uint32_t size, uint32_t* offset, uint16_t type, void* data_bin, uint32_t len_tlv)