X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fprotocol.cpp;h=147077cc1253c3c60e7c9ab049951b0e3223445b;hp=a4386994d06b84af59e2efaa99b226959b456d96;hb=a81c41acd873cda7f40bca634782230d9e57dc4f;hpb=c016a1ae2bc93a48074e4b8cafab70b9d2c9fc20

diff --git a/source/protocol.cpp b/source/protocol.cpp
index a438699..147077c 100644
--- a/source/protocol.cpp
+++ b/source/protocol.cpp
@@ -27,12 +27,12 @@ template<typename T>
 char *Assembler<T>::assemble(const T &v, char *data, char *end)
 {
 	// XXX Assumes little-endian
-	const char *ptr=reinterpret_cast<const char *>(&v)+sizeof(T);
+	const char *ptr = reinterpret_cast<const char *>(&v)+sizeof(T);
 	for(unsigned i=0; i<sizeof(T); ++i)
 	{
 		if(data==end)
 			throw Msp::Exception("Out of buffer space");
-		*data++=*--ptr;
+		*data++ = *--ptr;
 	}
 	return data;
 }
@@ -40,7 +40,7 @@ char *Assembler<T>::assemble(const T &v, char *data, char *end)
 template<>
 char *Assembler<string>::assemble(const string &v, char *data, char *end)
 {
-	data=Assembler<unsigned short>::assemble(v.size(), data, end);
+	data = Assembler<unsigned short>::assemble(v.size(), data, end);
 	if(end-data<static_cast<int>(v.size()))
 		throw Msp::Exception("Out of buffer space");
 	memcpy(data, v.data(), v.size());
@@ -50,21 +50,21 @@ char *Assembler<string>::assemble(const string &v, char *data, char *end)
 template<typename T>
 char *Assembler<vector<T> >::assemble(const vector<T> &v, char *data, char *end)
 {
-	data=Assembler<unsigned short>::assemble(v.size(), data, end);
+	data = Assembler<unsigned short>::assemble(v.size(), data, end);
 	for(typename vector<T>::const_iterator i=v.begin(); i!=v.end(); ++i)
-		data=Assembler<T>::assemble(*i, data, end);
+		data = Assembler<T>::assemble(*i, data, end);
 	return data;
 }
 
 template<typename T>
 const char *Assembler<T>::disassemble(T &v, const char *data, const char *end)
 {
-	char *ptr=reinterpret_cast<char *>(&v)+sizeof(T);
+	char *ptr = reinterpret_cast<char *>(&v)+sizeof(T);
 	for(unsigned i=0; i<sizeof(T); ++i)
 	{
 		if(data==end)
 			throw Msp::Exception("Premature end of data");
-		*--ptr=*data++;
+		*--ptr = *data++;
 	}
 	return data;
 }
@@ -73,7 +73,7 @@ template<>
 const char *Assembler<string>::disassemble(string &v, const char *data, const char *end)
 {
 	unsigned short size;
-	data=Assembler<unsigned short>::disassemble(size, data, end);
+	data = Assembler<unsigned short>::disassemble(size, data, end);
 	if(end-data<size)
 		throw Msp::Exception("Premature end of data");
 	v.assign(data, data+size);
@@ -87,11 +87,11 @@ const char *Assembler<vector<T> >::disassemble(vector<T> &v, const char *data, c
 	only code path leading here is from PacketDef<P>::disassemble, which creates
 	a new packet. */
 	unsigned short size;
-	data=Assembler<unsigned short>::disassemble(size, data, end);
+	data = Assembler<unsigned short>::disassemble(size, data, end);
 	for(unsigned i=0; i<size; ++i)
 	{
 		T u;
-		data=Assembler<T>::disassemble(u, data, end);
+		data = Assembler<T>::disassemble(u, data, end);
 		v.push_back(u);
 	}
 	return data;
@@ -114,16 +114,16 @@ Protocol::~Protocol()
 
 void Protocol::add_packet(PacketDefBase &pdef)
 {
-	PacketDefBase *&ptr=packet_class_defs[pdef.get_class_id()];
+	PacketDefBase *&ptr = packet_class_defs[pdef.get_class_id()];
 	if(ptr)
 		delete ptr;
-	ptr=&pdef;
-	packet_id_defs[pdef.get_id()]=&pdef;
+	ptr = &pdef;
+	packet_id_defs[pdef.get_id()] = &pdef;
 }
 
 const Protocol::PacketDefBase &Protocol::get_packet_by_class(unsigned id) const
 {
-	PacketMap::const_iterator i=packet_class_defs.find(id);
+	PacketMap::const_iterator i = packet_class_defs.find(id);
 	if(i==packet_class_defs.end())
 		throw KeyError("Unknown packet class", lexical_cast(id));
 	return *i->second;
@@ -131,7 +131,7 @@ const Protocol::PacketDefBase &Protocol::get_packet_by_class(unsigned id) const
 
 const Protocol::PacketDefBase &Protocol::get_packet_by_id(unsigned id) const
 {
-	PacketMap::const_iterator i=packet_id_defs.find(id);
+	PacketMap::const_iterator i = packet_id_defs.find(id);
 	if(i==packet_id_defs.end())
 		throw KeyError("Unknown packet ID", lexical_cast(id));
 	return *i->second;
@@ -139,13 +139,13 @@ const Protocol::PacketDefBase &Protocol::get_packet_by_id(unsigned id) const
 
 unsigned Protocol::disassemble(ReceiverBase &rcv, const char *data, unsigned size) const
 {
-	const unsigned char *udata=reinterpret_cast<const unsigned char *>(data);
-	unsigned id=(udata[0]<<8)+udata[1];
-	unsigned psz=(udata[2]<<8)+udata[3];
+	const unsigned char *udata = reinterpret_cast<const unsigned char *>(data);
+	unsigned id = (udata[0]<<8)+udata[1];
+	unsigned psz = (udata[2]<<8)+udata[3];
 	if(psz>size)
 		throw InvalidParameterValue("Not enough data for packet");
-	const PacketDefBase &pdef=get_packet_by_id(id);
-	const char *ptr=pdef.disassemble(rcv, data+4, data+psz);
+	const PacketDefBase &pdef = get_packet_by_id(id);
+	const char *ptr = pdef.disassemble(rcv, data+4, data+psz);
 	return ptr-data;
 }
 
@@ -153,7 +153,7 @@ unsigned Protocol::get_packet_size(const char *data, unsigned size) const
 {
 	if(size<4)
 		return 0;
-	const unsigned char *udata=reinterpret_cast<const unsigned char *>(data);
+	const unsigned char *udata = reinterpret_cast<const unsigned char *>(data);
 	return (udata[2]<<8)+udata[3];
 }
 
@@ -165,10 +165,10 @@ unsigned Protocol::get_hash() const
 
 void Protocol::assemble_header(char *buf, unsigned id, unsigned size)
 {
-	buf[0]=(id>>8)&0xFF;
-	buf[1]=id&0xFF;
-	buf[2]=(size>>8)&0xFF;
-	buf[3]=size&0xFF;
+	buf[0] = (id>>8)&0xFF;
+	buf[1] = id&0xFF;
+	buf[2] = (size>>8)&0xFF;
+	buf[3] = size&0xFF;
 }
 
 template<typename T>
@@ -229,7 +229,7 @@ template const char *Protocol::disassemble_field<>(vector<float> &v, const char
 template const char *Protocol::disassemble_field<>(vector<double> &v, const char *d, const char *e);
 template const char *Protocol::disassemble_field<>(vector<string> &v, const char *d, const char *e);
 
-unsigned Protocol::PacketDefBase::next_class_id=1;
+unsigned Protocol::PacketDefBase::next_class_id = 1;
 
 } // namespace Net
 } // namespace Msp