From 61ed86368de7725a9491159e3d5ce2e31267a84d Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Wed, 15 Jun 2011 21:17:58 +0200
Subject: [PATCH] sccp: Create a SCCPConnection on a handler, then open it

Change the way a SCCPConnection is created, this way the connection
only registers with the handler to get a srcRef generated and then
can open the connection.
---
 SCCPHandler.st | 45 +++++++++++++++++++++++++--------------------
 Tests.st       |  6 ++++--
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/SCCPHandler.st b/SCCPHandler.st
index bc8fe58..5419cf4 100644
--- a/SCCPHandler.st
+++ b/SCCPHandler.st
@@ -28,8 +28,22 @@ Object subclass: SCCPConnectionBase [
     SCCPConnectionBase class >> stateTimeout   [ ^ 3 ]
 
     SCCPConnectionBase class >> new [
+        ^ self shouldNotImplement
+    ]
+
+    SCCPConnectionBase class >> on: aHandler [
         ^ super new
-            initialize; yourself
+            initialize;
+            conManager: aHandler;
+            yourself
+    ]
+
+    connectionRequest: aData [
+        | res |
+        "Send the confirmation now"
+        res := Osmo.SCCPConnectionRequest
+                initWith: (self srcRef) dest: (Osmo.SCCPAddress createWith: 254) data: aData.
+        self nextPut: res toMessage.
     ]
 
     initialize [
@@ -44,7 +58,14 @@ Object subclass: SCCPConnectionBase [
 
     conManager: aHandler [
         <category: 'private'>
+
+        "Check if it is not there otherwise bad things happen"
+        conManager ifNotNil: [
+            ^ self error: 'Can only be set once.'.
+        ].
+
         conManager := aHandler.
+        conManager addConnection: self
     ]
 
     srcRef [
@@ -289,11 +310,10 @@ Object subclass: SCCPHandler [
 
     confirmConnection: aMsg [
         | con res |
-        con := self connectionSpecies new.
-        con conManager: self.
-        self addConnection: con.
 
-        "Confirm the messga now and send any data"
+        con := self connectionSpecies on: self.
+
+        "Confirm the message now and send any data"
         con confirm: aMsg.
         aMsg data ifNotNil: [
             con data: aMsg.
@@ -335,21 +355,6 @@ Object subclass: SCCPHandler [
         connection send: aMsg with: Osmo.IPAConstants protocolSCCP.
     ]
 
-    createConnection: aData [
-        | con res|
-
-        con := self connectionSpecies new.
-        con conManager: self.
-        self addConnection: con.
-
-        "Send the confirmation now"
-        res := Osmo.SCCPConnectionRequest
-                initWith: (con srcRef) dest: (Osmo.SCCPAddress createWith: 254) data: aData.
-        self sendMsg: res toMessage.
-
-        ^ con
-    ]
-
     referenceIsFree: aRef [
         <category: 'private'>
         self connections do: [:each |
diff --git a/Tests.st b/Tests.st
index 2b88b0c..db5913b 100644
--- a/Tests.st
+++ b/Tests.st
@@ -510,7 +510,8 @@ TestCase subclass: SCCPHandlerTest [
         handler := SCCPHandlerNonRec new.
         handler connection: DummyConnection new.
 
-        con := handler createConnection: '123' asByteArray.
+        con := SCCPMockConnection on: handler.
+        con connectionRequest: '123' asByteArray.
         handler handleMsg: (Osmo.SCCPConnectionConfirm initWithSrc: 567 dst: con srcRef) toMessage asByteArray.
         handler handleMsg: (Osmo.SCCPConnectionData initWith: con srcRef data: '123' asByteArray) toMessage asByteArray.
         handler handleMsg: (Osmo.SCCPConnectionReleased initWithDst: con srcRef src: 567 cause: 16rFE) toMessage asByteArray.
@@ -539,7 +540,8 @@ TestCase subclass: SCCPHandlerTest [
         server connection: (DirectConnection initWith: client).
 
         "Establish the connection"
-        con := client createConnection: '123' asByteArray.
+        con := SCCPMockConnection on: client.
+        con connectionRequest: '123' asByteArray.
         self assert: con state = SCCPConnection stateConnected.
 
         self assert: server connections size = 1.