Start of the COPS message refactoring to make all of these classes more semantic...

[packetcable.git] / packetcable-driver / src / main / java / org / umu / cops / stack / COPSClientAcceptMsg.java

diff --git a/packetcable-driver/src/main/java/org/umu/cops/stack/COPSClientAcceptMsg.java b/packetcable-driver/src/main/java/org/umu/cops/stack/COPSClientAcceptMsg.java
index af72a1a7a4557383018e4a0d5163f606c9bc224d..dde0963ba2dab611de2b72c6266ec6bb8bb70b49 100644 (file)
--- a/packetcable-driver/src/main/java/org/umu/cops/stack/COPSClientAcceptMsg.java
+++ b/packetcable-driver/src/main/java/org/umu/cops/stack/COPSClientAcceptMsg.java
@@ -175,26 +175,22 @@ public class COPSClientAcceptMsg extends COPSMsg {
             byte[] buf = new byte[data.length - _dataStart];\r
             System.arraycopy(data,_dataStart,buf,0,data.length - _dataStart);\r
 \r
-            COPSObjHeader objHdr = new COPSObjHeader (buf);\r
+            COPSObjHeader objHdr = COPSObjHeader.parse(buf);\r
             switch (objHdr.getCNum()) {\r
-            case COPSObjHeader.COPS_KA: {\r
-                _kaTimer = new COPSKATimer(buf);\r
-                _dataStart += _kaTimer.getDataLength();\r
-            }\r
-            break;\r
-            case COPSObjHeader.COPS_ACCT_TIMER: {\r
-                _acctTimer = new COPSAcctTimer(buf);\r
-                _dataStart += _acctTimer.getDataLength();\r
-            }\r
-            break;\r
-            case COPSObjHeader.COPS_MSG_INTEGRITY: {\r
-                _integrity = new COPSIntegrity(buf);\r
-                _dataStart += _integrity.getDataLength();\r
-            }\r
-            break;\r
-            default: {\r
-                throw new COPSException("Bad Message format");\r
-            }\r
+                case KA:\r
+                    _kaTimer = new COPSKATimer(buf);\r
+                    _dataStart += _kaTimer.getDataLength();\r
+                    break;\r
+                case ACCT_TIMER:\r
+                    _acctTimer = new COPSAcctTimer(buf);\r
+                    _dataStart += _acctTimer.getDataLength();\r
+                    break;\r
+                case MSG_INTEGRITY:\r
+                    _integrity = new COPSIntegrity(buf);\r
+                    _dataStart += _integrity.getDataLength();\r
+                    break;\r
+                default:\r
+                    throw new COPSException("Bad Message format");\r
             }\r
         }\r
         checkSanity();\r