From 7d8ecd1f7e47c7436cf0df9ba16c9721badbae2c Mon Sep 17 00:00:00 2001
From: Brandon Miller <bmiller@bmiller-E5430.(none)>
Date: Mon, 3 Mar 2014 12:02:56 -0800
Subject: [PATCH] fixed buffer error from issue #11

---
 example/unixSocket/basic/world-server.js |  2 +-
 lib/client.js                            | 12 ++++++++++++
 lib/socketServer.js                      | 12 ++++++++++++
 package.json                             |  2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/example/unixSocket/basic/world-server.js b/example/unixSocket/basic/world-server.js
index cd57127..7ad96e9 100644
--- a/example/unixSocket/basic/world-server.js
+++ b/example/unixSocket/basic/world-server.js
@@ -15,7 +15,7 @@ ipc.serve(
         ipc.server.on(
             'app.message',
             function(data,socket){
-                ipc.log('got a message from'.debug, (data.id).variable, (data.message).data);
+                //ipc.log('got a message from'.debug, (data.id).variable, (data.message).data);
                 ipc.server.emit(
                     socket,
                     'app.message',
diff --git a/lib/client.js b/lib/client.js
index eb639a2..3cef496 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -115,6 +115,18 @@ function connect(){
         'data',
         function(data) {
             client.log('## recieved events ##'.rainbow);
+            if(!this.ipcBuffer)
+                this.ipcBuffer='';
+                
+            data=(this.ipcBuffer+=data);
+            
+            if(data.slice(-1)!=eventParser.delimiter){
+                client.log('Socket buffer size exceeded consider smaller messages or a larger buffer.'.warn, 'Implementing software buffer expansion for this message.'.notice);
+                return;
+            }
+            
+            this.ipcBuffer='';
+            
             var events = eventParser.parse(data);
             var eCount = events.length;
             for(var i=0; i<eCount; i++){
diff --git a/lib/socketServer.js b/lib/socketServer.js
index 60d3820..c8e2e06 100644
--- a/lib/socketServer.js
+++ b/lib/socketServer.js
@@ -166,6 +166,18 @@ function init(path,config,log,port){
                                 socket.on(
                                     'data',
                                     function(data,UDPSocket){
+                                        if(!this.ipcBuffer)
+                                            this.ipcBuffer='';
+                                            
+                                        data=(this.ipcBuffer+=data);
+                                        
+                                        if(data.slice(-1)!=eventParser.delimiter){
+                                            server.log('Socket buffer size exceeded, consider smaller messages or a larger buffer.'.warn, 'Implementing software buffer expansion for this message.'.notice);
+                                            return;
+                                        }
+                                        
+                                        this.ipcBuffer='';
+                                        
                                         data=eventParser.parse(data);
                                         var sock=((server.udp4 || server.udp6)? UDPSocket : socket);
                                         
diff --git a/package.json b/package.json
index 42ff77b..a0a1799 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-ipc",
-  "version": "0.9.13",
+  "version": "0.9.15",
   "description": "A nodejs module for local and remote Inter Process Communication (IPC), Neural Networking, and able to facilitate machine learning.",
   "main": "node-ipc.js",
   "directories": {