Added packet_t.skip_bytes method to skip bytes at the start of a packet.

This commit is contained in:
Tobias Brunner
2012-08-08 15:12:25 +02:00
parent 896941d365
commit 73470cfe57
2 changed files with 26 additions and 3 deletions
+16 -3
View File
@@ -1,4 +1,5 @@
/* /*
* Copyright (C) 2012 Tobias Brunner
* Copyright (C) 2005-2006 Martin Willi * Copyright (C) 2005-2006 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
@@ -42,6 +43,11 @@ struct private_packet_t {
* message data * message data
*/ */
chunk_t data; chunk_t data;
/**
* actual chunk returned from get_data, adjusted when skip_bytes is called
*/
chunk_t adjusted_data;
}; };
METHOD(packet_t, set_source, void, METHOD(packet_t, set_source, void,
@@ -73,14 +79,20 @@ METHOD(packet_t, get_destination, host_t*,
METHOD(packet_t, get_data, chunk_t, METHOD(packet_t, get_data, chunk_t,
private_packet_t *this) private_packet_t *this)
{ {
return this->data; return this->adjusted_data;
} }
METHOD(packet_t, set_data, void, METHOD(packet_t, set_data, void,
private_packet_t *this, chunk_t data) private_packet_t *this, chunk_t data)
{ {
free(this->data.ptr); free(this->data.ptr);
this->data = data; this->adjusted_data = this->data = data;
}
METHOD(packet_t, skip_bytes, void,
private_packet_t *this, size_t bytes)
{
this->adjusted_data = chunk_skip(this->adjusted_data, bytes);
} }
METHOD(packet_t, destroy, void, METHOD(packet_t, destroy, void,
@@ -108,7 +120,7 @@ METHOD(packet_t, clone_, packet_t*,
} }
if (this->data.ptr != NULL) if (this->data.ptr != NULL)
{ {
other->set_data(other, chunk_clone(this->data)); other->set_data(other, chunk_clone(this->adjusted_data));
} }
return other; return other;
} }
@@ -128,6 +140,7 @@ packet_t *packet_create(void)
.get_source = _get_source, .get_source = _get_source,
.set_destination = _set_destination, .set_destination = _set_destination,
.get_destination = _get_destination, .get_destination = _get_destination,
.skip_bytes = _skip_bytes,
.clone = _clone_, .clone = _clone_,
.destroy = _destroy, .destroy = _destroy,
}, },
+10
View File
@@ -1,4 +1,5 @@
/* /*
* Copyright (C) 2012 Tobias Brunner
* Copyright (C) 2005-2006 Martin Willi * Copyright (C) 2005-2006 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
@@ -92,6 +93,15 @@ struct packet_t {
*/ */
void (*set_data) (packet_t *packet, chunk_t data); void (*set_data) (packet_t *packet, chunk_t data);
/**
* Increase the offset where the actual packet data starts.
*
* @note The offset is reset to 0 when set_data() is called.
*
* @param bytes the number of additional bytes to skip
*/
void (*skip_bytes) (packet_t *packet, size_t bytes);
/** /**
* Clones a packet_t object. * Clones a packet_t object.
* *