Temporarily switched back to the buffer reading messages (rather than the msg stream)

1 files changed, 8 insertions, 8 deletions

diff --git a/comm/OLD/ReqMgr.cc b/comm/OLD/ReqMgr.cc
index 288f203..8a238c2 100644
--- a/comm/OLD/ReqMgr.cc
+++ b/comm/OLD/ReqMgr.cc
@@ -3,7 +3,7 @@
  *
  *	by Michel Beaudouin-Lafon
  *
- *	Copyright 1993
+ *	Copyright 1993-1995
  *	Centre d'Etudes de la Navigation Aerienne (CENA)
  *
  *	Request management, by Stephane Chatty
@@ -190,7 +190,7 @@ UchMsgMgr :: DumpClientCode (ofstream& f)
 {
 	f << "UchMessage*\n" << Name << "Service :: ConvertAnswer (UchMsgBuffer& b)\n{\n";
 	f << "\tlword type;\n";
-	f << "\tReadLong (type);\n\n";
+	f << "\tb.PeekLong (type, lwsize);\n\n";
 	f << "\tUchMessage* a = 0;\n";
 	f << "\tswitch (type) {\n";
 	CcuListIterOf <MsgType> ans = Answers;
@@ -200,12 +200,12 @@ UchMsgMgr :: DumpClientCode (ofstream& f)
 		f << "\t\tbreak;\n";
 	}
 	f << "\t}\n";
-	f << "\tif (a)\n\t\tReadMsg (*a);\n\treturn a;\n}\n\n";
+	f << "\tif (a)\n\t\tb.ReadMsg (*a);\n\treturn a;\n}\n\n";
 
 
 	f << "bool\n" << Name << "Service :: NewMessage (UchMsgBuffer& b, bool)\n{\n";
 	f << "\tlword type;\n";
-	f << "\tReadLong (type);\n\n";
+	f << "\tb.PeekLong (type, lwsize);\n\n";
 	f << "\tUchMessage* m = 0;\n";
 	f << "\tswitch (type) {\n";
 	CcuListIterOf <MsgType> evt = Events;
@@ -215,7 +215,7 @@ UchMsgMgr :: DumpClientCode (ofstream& f)
 		f << "\t\tbreak;\n";
 	}
 	f << "\t}\n";
-	f << "\tif (m) {\n\t\tReadMsg (*m);\n\t\tPutEvent (m);\n\t\treturn true;\n";
+	f << "\tif (m) {\n\t\tb.ReadMsg (*m);\n\t\tPutEvent (m);\n\t\treturn true;\n";
 	f << "\t} else\n\t\treturn false;\n}\n\n";
 }
 
@@ -225,7 +225,7 @@ UchMsgMgr :: DumpServerCode (ofstream& f)
 {
 	f << "bool\n" << Name << "Client :: NewMessage (UchMsgBuffer& b, bool)\n{\n";
 	f << "\tlword type;\n";
-	f << "\tReadLong (type);\n\n";
+	f << "\tb.PeekLong (type, lwsize);\n\n";
 	f << "\tUchMessage* m = 0;\n";
 	f << "\tswitch (type) {\n";
 	CcuListIterOf <MsgType> req = Requests;
@@ -235,7 +235,7 @@ UchMsgMgr :: DumpServerCode (ofstream& f)
 		f << "\t\tbreak;\n";
 	}
 	f << "\t}\n";
-	f << "\tif (m) {\n\t\tReadMsg (*m);\n\t\tm->Activate (*this);\n\t\treturn true;\n";
+	f << "\tif (m) {\n\t\tb.ReadMsg (*m);\n\t\tm->Activate (*this);\n\t\treturn true;\n";
 	f << "\t} else\n\t\treturn false;\n}\n\n";
 
 	f << "UchClient*\n" << Name << "Server :: CreateClient (int fd)\n{\n";
@@ -388,7 +388,7 @@ MsgType :: DumpCode (ofstream& f, int dest)
 	CcuListIterOf <MsgField> field (Fields);
 	if (receiver) {
 		f << "void\n" << classname << " :: ReadFrom (UchIOS& b, lword)\n{\n";
-#if 0
+#if 1
 		f << "\tlword type;\n\tb >> type";
 #else
 		f << "\t b ";