3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-29 04:54:28 +01:00
Code Issues Releases Wiki Activity

Fix merge conflicts with master

Browse Source 
Conflicts:
	src/pdu_option.cpp
This commit is contained in:
Matias Fontanini
2017-07-23 14:32:15 -07:00
parent eed8229a04 87c0e3a337
commit 7003541284
4 changed files with 61 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pdu_option.cpp
View File

@@ -97,9 +97,7 @@ convert_vector(const uint8_t* ptr, uint32_t data_size, PDU::endian_type endian)
while (input) {
pair<T, U> data;
data.first = input.read<T>();
ptr += sizeof(T);
data.second = input.read<U>();
ptr += sizeof(U);
if (endian == PDU::BE) {
data.first = Endian::be_to_host(data.first);
data.second = Endian::be_to_host(data.second);
@@ -231,7 +229,6 @@ vector<IPv4Address> convert(const uint8_t* ptr, uint32_t data_size, PDU::endian_
if (data_size % 4 != 0) {
throw malformed_option();
}
InputMemoryStream input(ptr, data_size);
vector<IPv4Address> output(data_size / sizeof(uint32_t));
vector<IPv4Address>::iterator it = output.begin();