3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-25 19:51:34 +01:00
Code Issues Releases Wiki Activity

Code cleanup and use same syntax on the entire project

Browse Source 
Initial code cleanup

More code cleanup

Cleanup more code

Cleanup Dot11 code

Fix OSX build issue

Cleanup examples

Fix ref and pointer declaration syntax

Fix braces
This commit is contained in:
Matias Fontanini
2016-01-02 08:17:59 -08:00
parent f5a82b1a17
commit d84f10cf08
177 changed files with 13203 additions and 12272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/bootp.cpp
View File

@@ -33,98 +33,100 @@
#include "exceptions.h"
#include "memory_helpers.h"
using std::copy;
using Tins::Memory::InputMemoryStream;
using Tins::Memory::OutputMemoryStream;
namespace Tins{
BootP::BootP()
: _bootp(), _vend(64) {
: bootp_(), vend_(64) {
}
BootP::BootP(const uint8_t *buffer, uint32_t total_sz, uint32_t vend_field_size)
: _vend(vend_field_size)
{
BootP::BootP(const uint8_t* buffer, uint32_t total_sz, uint32_t vend_field_size)
: vend_(vend_field_size) {
InputMemoryStream stream(buffer, total_sz);
stream.read(_bootp);
buffer += sizeof(bootphdr);
total_sz -= sizeof(bootphdr);
_vend.assign(stream.pointer(), stream.pointer() + vend_field_size);
stream.read(bootp_);
if (!stream.can_read(vend_field_size)) {
throw malformed_packet();
}
stream.read(vend_, vend_field_size);
}
uint32_t BootP::header_size() const {
return static_cast<uint32_t>(sizeof(bootphdr) + _vend.size());
return static_cast<uint32_t>(sizeof(bootp_) + vend_.size());
}
void BootP::opcode(uint8_t new_opcode) {
_bootp.opcode = new_opcode;
void BootP::opcode(uint8_t code) {
bootp_.opcode = code;
}
void BootP::htype(uint8_t new_htype) {
_bootp.htype = new_htype;
void BootP::htype(uint8_t type) {
bootp_.htype = type;
}
void BootP::hlen(uint8_t new_hlen) {
_bootp.hlen = new_hlen;
void BootP::hlen(uint8_t length) {
bootp_.hlen = length;
}
void BootP::hops(uint8_t new_hops) {
_bootp.hops = new_hops;
void BootP::hops(uint8_t count) {
bootp_.hops = count;
}
void BootP::xid(uint32_t new_xid) {
_bootp.xid = Endian::host_to_be(new_xid);
void BootP::xid(uint32_t identifier) {
bootp_.xid = Endian::host_to_be(identifier);
}
void BootP::secs(uint16_t new_secs) {
_bootp.secs = Endian::host_to_be(new_secs);
void BootP::secs(uint16_t value) {
bootp_.secs = Endian::host_to_be(value);
}
void BootP::padding(uint16_t new_padding) {
_bootp.padding = Endian::host_to_be(new_padding);
void BootP::padding(uint16_t value) {
bootp_.padding = Endian::host_to_be(value);
}
void BootP::ciaddr(ipaddress_type new_ciaddr) {
_bootp.ciaddr = new_ciaddr;
void BootP::ciaddr(ipaddress_type address) {
bootp_.ciaddr = address;
}
void BootP::yiaddr(ipaddress_type new_yiaddr) {
_bootp.yiaddr = new_yiaddr;
void BootP::yiaddr(ipaddress_type address) {
bootp_.yiaddr = address;
}
void BootP::siaddr(ipaddress_type new_siaddr) {
_bootp.siaddr = new_siaddr;
void BootP::siaddr(ipaddress_type address) {
bootp_.siaddr = address;
}
void BootP::giaddr(ipaddress_type new_giaddr) {
_bootp.giaddr = new_giaddr;
void BootP::giaddr(ipaddress_type address) {
bootp_.giaddr = address;
}
void BootP::sname(const uint8_t *new_sname) {
//std::memcpy(_bootp.sname, new_sname, sizeof(_bootp.sname));
std::copy(new_sname, new_sname + sizeof(_bootp.sname), _bootp.sname);
void BootP::sname(const uint8_t* new_sname) {
copy(new_sname, new_sname + sizeof(bootp_.sname), bootp_.sname);
}
void BootP::file(const uint8_t *new_file) {
//std::memcpy(_bootp.file, new_file, sizeof(_bootp.file));
std::copy(new_file, new_file + sizeof(_bootp.file), _bootp.file);
void BootP::file(const uint8_t* new_file) {
copy(new_file, new_file + sizeof(bootp_.file), bootp_.file);
}
void BootP::vend(const vend_type &new_vend) {
_vend = new_vend;
void BootP::vend(const vend_type& newvend_) {
vend_ = newvend_;
}
void BootP::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent) {
void BootP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) {
OutputMemoryStream stream(buffer, total_sz);
stream.write(_bootp);
stream.write(_vend.begin(), _vend.end());
stream.write(bootp_);
stream.write(vend_.begin(), vend_.end());
}
bool BootP::matches_response(const uint8_t *ptr, uint32_t total_sz) const {
if(total_sz < sizeof(bootphdr))
bool BootP::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
if (total_sz < sizeof(bootp_)) {
return false;
const bootphdr *bootp_ptr = (const bootphdr *)ptr;
return bootp_ptr->xid == _bootp.xid;
}
}
const bootp_header* bootp_ptr = (const bootp_header *)ptr;
return bootp_ptr->xid == bootp_.xid;
}
} // Tins