Attachment #259592 for bug #333099

View | Details | Raw Unified | Return to bug 333099
Collapse All | Expand All




 */

void
encode__int(struct evbuffer *evbuf, uint32_t number)
{
	int off = 1, nibbles = 0;
	uint8_t data[5];

tag_marshal(struct evbuffer *evbuf, uint8_t tag, void *data, uint16_t len)
{
	evbuffer_add(evbuf, &tag, sizeof(tag));
	encode__int(evbuf, len);
	evbuffer_add(evbuf, data, len);
}


tag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer)
{
	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
	encode__int(_buf, integer);

	evbuffer_add(evbuf, &tag, sizeof(tag));
	encode__int(evbuf, EVBUFFER_LENGTH(_buf));
	evbuffer_add_buffer(evbuf, _buf);
}


{
	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));

	encode__int(_buf, tv->tv_sec);
	encode__int(_buf, tv->tv_usec);

	tag_marshal(evbuf, tag, EVBUFFER_DATA(_buf),
	    EVBUFFER_LENGTH(_buf));

Lines 86-92 Link Here

(-)honeyd-1.5c.orig/tagging.h (-1 / +3 lines)
86	void tag_marshal(struct evbuffer evbuf, uint8_t tag, void data,	86	void tag_marshal(struct evbuffer evbuf, uint8_t tag, void data,
87	uint16_t len);	87	uint16_t len);
88		88
89	void encode_int(struct evbuffer *evbuf, uint32_t number);	89	// Rename encode_int to encode__int to avoid collision with
		90	// macro in libevent-2 event2/tag_compat.h
		91	void encode__int(struct evbuffer *evbuf, uint32_t number);
90		92
91	void tag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer);	93	void tag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer);
92		94

Lines 438-444 Link Here

(-)honeyd-1.5c.orig/untagging.c (-1 / +1 lines)
438	for (i = 0; i < TEST_MAX_INT; i++) {	438	for (i = 0; i < TEST_MAX_INT; i++) {
439	int oldlen, newlen;	439	int oldlen, newlen;
440	oldlen = EVBUFFER_LENGTH(tmp);	440	oldlen = EVBUFFER_LENGTH(tmp);
441	encode_int(tmp, integers[i]);	441	encode__int(tmp, integers[i]);
442	newlen = EVBUFFER_LENGTH(tmp);	442	newlen = EVBUFFER_LENGTH(tmp);
443	fprintf(stderr, "\t\tencoded 0x%08x with %d bytes\n",	443	fprintf(stderr, "\t\tencoded 0x%08x with %d bytes\n",
444	integers[i], newlen - oldlen);	444	integers[i], newlen - oldlen);

Return to bug 333099

Lines 73-79 Link Here

(-)honeyd-1.5c.orig/tagging.c (-6 / +6 lines)
73	*/	73	*/
74		74
75	void	75	void
76	encode_int(struct evbuffer *evbuf, uint32_t number)	76	encode__int(struct evbuffer *evbuf, uint32_t number)
77	{	77	{
78	int off = 1, nibbles = 0;	78	int off = 1, nibbles = 0;
79	uint8_t data[5];	79	uint8_t data[5];
Lines 108-114 Link Here
108	tag_marshal(struct evbuffer evbuf, uint8_t tag, void data, uint16_t len)	108	tag_marshal(struct evbuffer evbuf, uint8_t tag, void data, uint16_t len)
109	{	109	{
110	evbuffer_add(evbuf, &tag, sizeof(tag));	110	evbuffer_add(evbuf, &tag, sizeof(tag));
111	encode_int(evbuf, len);	111	encode__int(evbuf, len);
112	evbuffer_add(evbuf, data, len);	112	evbuffer_add(evbuf, data, len);
113	}	113	}
114		114
Lines 117-126 Link Here
117	tag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer)	117	tag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer)
118	{	118	{
119	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));	119	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
120	encode_int(_buf, integer);	120	encode__int(_buf, integer);
121		121
122	evbuffer_add(evbuf, &tag, sizeof(tag));	122	evbuffer_add(evbuf, &tag, sizeof(tag));
123	encode_int(evbuf, EVBUFFER_LENGTH(_buf));	123	encode__int(evbuf, EVBUFFER_LENGTH(_buf));
124	evbuffer_add_buffer(evbuf, _buf);	124	evbuffer_add_buffer(evbuf, _buf);
125	}	125	}
126		126
Lines 135-142 Link Here
135	{	135	{
136	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));	136	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
137		137
138	encode_int(_buf, tv->tv_sec);	138	encode__int(_buf, tv->tv_sec);
139	encode_int(_buf, tv->tv_usec);	139	encode__int(_buf, tv->tv_usec);
140		140
141	tag_marshal(evbuf, tag, EVBUFFER_DATA(_buf),	141	tag_marshal(evbuf, tag, EVBUFFER_DATA(_buf),
142	EVBUFFER_LENGTH(_buf));	142	EVBUFFER_LENGTH(_buf));