Commit 2c001e65 authored by Daniel Friesel's avatar Daniel Friesel
Browse files

Add a 16-bit XDR variant

parent f4394afb

include/object/xdr16input.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef XDRINPUT_H

#define XDRINPUT_H



#include <stdint.h>



class XDRInput {

	private:

		XDRInput(const XDRInput& copy);

		char *data;

		uint32_t pos;



	public:

		XDRInput(char *d) : pos(0) { data = d; }

		uint16_t get_uint16();

		int16_t get_int16();

		uint32_t get_uint32();

		int32_t get_int32();

		uint64_t get_uint64();

		int64_t get_int64();

		float get_float();

		double get_double();

		uint16_t get_opaque_length();

		char* get_opaque(uint16_t length);

		void get_string(char *target);

};



#endif

include/object/xdr16stream.h

0 → 100644
+50 −0
Original line number Diff line number Diff line 
#ifndef XDRSTREAM_H

#define XDRSTREAM_H



#include <stdint.h>



class XDRStream {

 private:

	XDRStream(const XDRStream& copy);

	uint16_t next_array_len;

	bool is_fixed_length;



 public:

	XDRStream() : next_array_len(0) {}

	void setNextArrayLen(uint16_t len) {next_array_len = len;}

	void setFixedLength() { is_fixed_length = true; }

	void setVariableLength() { is_fixed_length = false; }



	virtual void put(char c) = 0;



	virtual void flush() {}



	XDRStream & operator<<(char c);

	XDRStream & operator<<(unsigned char c);

	XDRStream & operator<<(uint16_t number);

	XDRStream & operator<<(int16_t number);

	XDRStream & operator<<(uint32_t number);

	XDRStream & operator<<(int32_t number);

	XDRStream & operator<<(uint64_t number);

	XDRStream & operator<<(int64_t number);

	XDRStream & operator<<(float number);

	XDRStream & operator<<(double number);

	XDRStream & operator<<(char const *text);

	template<uint16_t TSize> XDRStream & operator<<(char const (&text)[TSize]);

	XDRStream & operator<<(XDRStream & (*fun) (XDRStream &));

};





// FLUSH: flush XDRStream buffer

XDRStream & flush(XDRStream & os);



// TERM: zero-termination

XDRStream & term(XDRStream & os);



template<int TSize>

XDRStream & opaque(XDRStream & os);



XDRStream & fixed(XDRStream & os);

XDRStream & variable(XDRStream & os);



#endif //OUTPUTSTREAM_H

src/app/prototest/Makefile.inc

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ ifeq (${prototest_xdr}, 1) 
	CXX_TARGETS += src/os/object/xdrstream.cc src/os/object/xdrinput.cc

endif



ifeq (${prototest_xdr16}, 1)

	COMMON_FLAGS += -DPROTOTEST_XDR16

	CXX_TARGETS += src/os/object/xdr16stream.cc src/os/object/xdr16input.cc

endif



# Don't try to make .capnp from .capnp.c

%.capnp: ;

src/app/prototest/main.cc

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ 
#include "object/xdrstream.h"

#include "object/xdrinput.h"

#endif

#ifdef PROTOTEST_XDR16

#include "object/stdbuf.h"

#include "object/xdr16stream.h"

#include "object/xdr16input.h"

#endif



#include <stdint.h>

src/os/object/xdr16input.cc

0 → 100644
+99 −0
Original line number Diff line number Diff line 
#include "object/xdr16input.h"



uint16_t XDRInput::get_uint16()

{

	uint32_t ret = ((uint8_t)data[pos]<<8) | (uint8_t)data[pos+1];

	pos += 2;

	return ret;

}



int16_t XDRInput::get_int16()

{

	int32_t ret = (data[pos]<<8) | data[pos+1];

	pos += 2;

	return ret;

}



uint32_t XDRInput::get_uint32()

{

	uint32_t ret = ((uint8_t)data[pos]<<24) | ((uint8_t)data[pos+1]<<16)

		| ((uint8_t)data[pos+2]<<8) | (uint8_t)data[pos+3];

	pos += 4;

	return ret;

}



int32_t XDRInput::get_int32()

{

	int32_t ret = (data[pos]<<24) | (data[pos+1]<<16) | (data[pos+2]<<8) | data[pos+3];

	pos += 4;

	return ret;

}



uint64_t XDRInput::get_uint64()

{

	uint64_t ret0 = ((uint8_t)data[pos]<<24) | ((uint8_t)data[pos+1]<<16)

		| ((uint8_t)data[pos+2]<<8) | (uint8_t)data[pos+3];

	pos += 4;

	uint64_t ret1 = ((uint8_t)data[pos]<<24) | ((uint8_t)data[pos+1]<<16)

		| ((uint8_t)data[pos+2]<<8) | (uint8_t)data[pos+3];

	pos += 4;

	return (ret0 << 32) | ret1;

}



int64_t XDRInput::get_int64()

{

	int64_t ret0 = (data[pos]<<24) | (data[pos+1]<<16) | (data[pos+2]<<8) | data[pos+3];

	pos += 4;

	int64_t ret1 = (data[pos]<<24) | (data[pos+1]<<16) | (data[pos+2]<<8) | data[pos+3];

	pos += 4;

	return (ret0 << 32) | ret1;

}



float XDRInput::get_float()

{

	union {

		uint32_t i;

		float f;

	} v;

	v.i = get_uint32();

	return v.f;

}



double XDRInput::get_double()

{

	union {

		uint64_t i;

		double d;

	} v;

	v.i = get_uint64();

	return v.d;

}



uint16_t XDRInput::get_opaque_length()

{

	return get_uint16();

}



char *XDRInput::get_opaque(uint16_t length)

{

	char *ret = data + pos;

	pos += length;

	if (length % 2) {

		pos += 2 - (length % 2);

	}

	return ret;

}



void XDRInput::get_string(char* target)

{

	uint16_t length = get_opaque_length();

	uint16_t i;

	for (i = 0; i < length; i++) {

		target[i] = data[pos + i];

	}

	target[i] = 0;

	pos += length;

	if (length % 2) {

		pos += 2 - (length % 2);

	}

}