Commit bc8ec3a3d6c2411d1718b5485aa2e4655cbbb04d

Fred Emmott
Sat Feb 20 12:47:31 CET 2010

Tree SHA1: 800b511
Parent SHA1: 9d38df8 (Change TrackData::mimeData to be a QByteArray - seems unused, but that's about to change)
raw diff | raw patch

add NetworkCommon/NetworkMessage, and start using it for discovery
Added support for 'Library' plugins, and put NetworkCommon after
NetworkClient/NetworkServer in the link order.

Diff rendering mode:
inline
side by side


25	25	Boffin
26	26	# WIP:
27	27	NetworkClient
28		NetworkCommon
29	28	NetworkServer
30	29	)
31	30
…	…
52	52	ENDIF()
53	53	ENDFOREACH()
54	54
	55	# Library plugins
	56	IF(WITH_NetworkClient_PLUGIN OR WITH_NetworkServer_PLUGIN)
	57	LIST(APPEND ACTIVE_PLUGINS NetworkCommon)
	58	ENDIF()
	59
	60	# Write the header file defining our plugins
55	61	SET(STATIC_PLUGINS_H "${CMAKE_CURRENT_BINARY_DIR}/StaticPlugins.h")
56	62	FILE(WRITE ${STATIC_PLUGINS_H} "#include <QtPlugin>\n")
57	63	FOREACH(plugin ${ACTIVE_PLUGINS})


1	1	SET(
2	2	CLASSES
3	3	NetworkCommon
	4	NetworkMessage
4	5	)
5	6
6	7	SET(SOURCES)


		1	#include "NetworkMessage.h"
		2
		3	NetworkMessage::NetworkMessage(const QByteArray& command, const QByteArray& payload, MessageType messageType)
		4	{
		5	m_command = command;
		6	m_payload = payload;
		7	m_messageType = messageType;
		8	}
		9
		10	void NetworkMessage::updateSerialization() const
		11	{
		12	// netstrings-influenced
		13	// CommandLength,Command,PayloadLength,Payload,{U\|S,timestamp-length,timestamp,message-uuid,signature};
		14	//
		15	// Examples:
		16	// 3,foo,0,,U;
		17	// 3,bar,3,baz,S,10,1266356591,{fc8d8c6c-2ede-4bb8-8685-2cc47cdd8b2b},0000000000000000000000000000000000000000
		18	//
		19	// Where:
		20	// - timestamp is the number of seconds since 1970-01-01T00:00:00 UTC
		21	// - message-uuid is a per-message UUID to prevent replays
		22	// - signature is an HMAC-SHA1 of everything up to and including the previous comma
		23	QByteArray& out = m_serialized;
		24	m_serialized.clear();
		25	Q_ASSERT(m_messageType == UnsignedMessage);
		26
		27	out.append(QString::number(m_command.length()).toLatin1());
		28	out.append(',');
		29	out.append(m_command);
		30	out.append(',');
		31	out.append(QString::number(m_payload.length()).toLatin1());
		32	out.append(',');
		33	out.append(m_payload);
		34	out.append(",U;");
		35	}
		36
		37	QByteArray NetworkMessage::toByteArray() const
		38	{
		39	if(m_serialized.isNull())
		40	{
		41	updateSerialization();
		42	}
		43	return m_serialized;
		44	}


		1	#pragma once
		2
		3	#include <QByteArray>
		4	#include <QIODevice>
		5
		6	class NetworkMessage
		7	{
		8	public:
		9	enum MessageType
		10	{
		11	UnsignedMessage,
		12	SignedMessage
		13	};
		14	NetworkMessage(const QByteArray& command, const QByteArray& payload, MessageType messageType);
		15	QByteArray toByteArray() const;
		16	private:
		17	void updateSerialization() const; // cache
		18
		19	QByteArray m_command;
		20	QByteArray m_payload;
		21	MessageType m_messageType;
		22
		23	mutable QByteArray m_serialized; // used as a cache
		24	};


11	11	LIST(APPEND HEADERS ${class}.h)
12	12	ENDFOREACH()
13	13
14		INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
	14	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ../NetworkCommon)
15	15	QT4_WRAP_CPP(MOC_SOURCES ${HEADERS})
16	16	ADD_LIBRARY(
17	17	NetworkServer


1	1	#include "NetworkServer_Implementation.h"
2	2
3		#include "../NetworkCommon/NetworkCommon.h"
	3	#include "NetworkCommon.h"
	4	#include "NetworkMessage.h"
4	5
5	6	#include "Uuid.h"
6	7
…	…
67	67	payload.append(port);
68	68	payload.append(',');
69	69
70		m_discoveryResponse = createMessage("ANNOUNCE", payload, UnsignedMessage);
	70	m_discoveryResponse = NetworkMessage("ANNOUNCE", payload, NetworkMessage::UnsignedMessage).toByteArray();
71	71	}
72		}
73
74		QByteArray NetworkServer::Implementation::createMessage(const QByteArray& command, const QByteArray& payload, MessageType messageType) const
75		{
76		// netstrings-influenced
77		// CommandLength,Command,PayloadLength,Payload,{U\|S,timestamp-length,timestamp,message-uuid,signature};
78		//
79		// Examples:
80		// 3,foo,0,,U;
81		// 3,bar,3,baz,S,10,1266356591,{fc8d8c6c-2ede-4bb8-8685-2cc47cdd8b2b},0000000000000000000000000000000000000000
82		//
83		// Where:
84		// - timestamp is the number of seconds since 1970-01-01T00:00:00 UTC
85		// - message-uuid is a per-message UUID to prevent replays
86		// - signature is an HMAC-SHA1 of everything up to and including the previous comma
87		QByteArray out;
88		Q_ASSERT(messageType == UnsignedMessage);
89		Q_UNUSED(messageType);
90
91		out.append(QString::number(command.length()).toLatin1());
92		out.append(',');
93		out.append(command);
94		out.append(',');
95		out.append(QString::number(payload.length()).toLatin1());
96		out.append(',');
97		out.append(payload);
98		out.append(",U;");
99		return out;
100	72	}
101	73
102	74	void NetworkServer::Implementation::sendDiscoveryResponses()


20	20	private slots:
21	21	void sendDiscoveryResponses();
22	22	private:
23		enum MessageType
24		{
25		UnsignedMessage,
26		SignedMessage
27		};
28		QByteArray createMessage(const QByteArray& command, const QByteArray& payload, MessageType messageType) const;
29
30	23	Jerboa::CollectionInterface* m_collection;
31	24	Jerboa::PlayerInterface* m_player;
32	25	Jerboa::PlaylistInterface* m_playlist;

Commit bc8ec3a3d6c2411d1718b5485aa2e4655cbbb04d

Gitorious