beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Put in XML fragment parsing - listener now basically works over tcp

Browse source
This commit is contained in:
Alex Hudson 2011-06-28 23:38:32 +01:00
parent 24491508cd
commit d7d022078e
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
SparkleLib/SparkleListenerTcp.cs
View file

@ -74,6 +74,16 @@ namespace SparkleLib {
} }
} }
private TcpMessagePacket ReceiveCommand(byte[] input)
{
XmlSerializer serializer = new XmlSerializer(typeof(TcpMessagePacket));
MemoryStream ms = new MemoryStream(input);
TcpMessagePacket ret = (TcpMessagePacket) serializer.Deserialize(ms);
return ret;
}
// Starts a new thread and listens to the channel // Starts a new thread and listens to the channel
public override void Connect () public override void Connect ()
{ {
@ -95,8 +105,7 @@ namespace SparkleLib {
foreach (string channel in base.channels) { foreach (string channel in base.channels) {
SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel);
this.SendCommand(new TcpMessagePacket(channel, "register"));
this.SendCommand(new TcpMessagePacket(channel, "subscribe"));
} }
byte [] bytes = new byte [4096]; byte [] bytes = new byte [4096];
@ -105,18 +114,20 @@ namespace SparkleLib {
while (this.socket.Connected) { while (this.socket.Connected) {
int bytes_read = this.socket.Receive (bytes); int bytes_read = this.socket.Receive (bytes);
if (bytes_read > 0) { if (bytes_read > 0) {
Console.WriteLine (Encoding.UTF8.GetString (bytes)); TcpMessagePacket message = this.ReceiveCommand(bytes);
SparkleHelpers.DebugInfo ("ListenerTcp", "Update for folder " + message.repo);
string received_message = bytes.ToString ().Trim (); OnAnnouncement (new SparkleAnnouncement (message.repo, message.readable));
string folder_id = ""; // TODO: parse message, use XML
OnAnnouncement (new SparkleAnnouncement (folder_id, received_message));
} else { } else {
SparkleHelpers.DebugInfo ("ListenerTcp", "Error on socket");
lock (this.mutex) { lock (this.mutex) {
this.socket.Close(); this.socket.Close();
this.connected = false; this.connected = false;
} }
} }
} }
SparkleHelpers.DebugInfo ("ListenerTcp", "Disconnected from " + Server.Host);
// TODO: attempt to reconnect..? // TODO: attempt to reconnect..?
} catch (SocketException e) { } catch (SocketException e) {
SparkleHelpers.DebugInfo ("ListenerTcp", "Could not connect to " + Server + ": " + e.Message); SparkleHelpers.DebugInfo ("ListenerTcp", "Could not connect to " + Server + ": " + e.Message);
@ -137,7 +148,7 @@ namespace SparkleLib {
if (IsConnected) { if (IsConnected) {
SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel);
this.SendCommand(new TcpMessagePacket(channel, "subscribe")); this.SendCommand(new TcpMessagePacket(channel, "register"));
} }
} }
} }
@ -145,7 +156,7 @@ namespace SparkleLib {
public override void Announce (SparkleAnnouncement announcement) public override void Announce (SparkleAnnouncement announcement)
{ {
this.SendCommand(new TcpMessagePacket(announcement.FolderIdentifier, "publish")); this.SendCommand(new TcpMessagePacket(announcement.FolderIdentifier, "new_version"));
// Also announce to ourselves for debugging purposes // Also announce to ourselves for debugging purposes
// base.OnAnnouncement (announcement); // base.OnAnnouncement (announcement);