Changeset 2293

Timestamp:

11/08/06 10:44:29 (7 years ago)

Author:

stud-matfried

Message:

eval: Fixed the nop_dispatcher to still serialize messages.

Location:

natfw-nslp/trunk/eval

Files:

• nf.cpp (modified) (1 diff)
• ni.cpp (modified) (1 diff)
• utils.cpp (modified) (2 diffs)
• utils.h (modified) (2 diffs)

natfw-nslp/trunk/eval/nf.cpp

@@ -16 +16 @@
 using namespace protlib;
 
-
-class nop_dispatcher : public dispatcher {
-  public:
-        nop_dispatcher(session_manager *m, nat_manager *n,
-                        policy_rule_installer *p, natfw_config *c)
-                : dispatcher(m, n, p, c) { }
-
-        void send_message(msg::ntlp_msg *msg) throw () { }
-        id_t start_timer(const session *s, int seconds) throw () { return 0; }
-};
 
 

natfw-nslp/trunk/eval/ni.cpp

@@ -16 +16 @@
 using namespace protlib;
 
-
-class nop_dispatcher : public dispatcher {
-  public:
-        nop_dispatcher(session_manager *m, nat_manager *n,
-                        policy_rule_installer *p, natfw_config *c)
-                : dispatcher(m, n, p, c) { }
-
-        void send_message(msg::ntlp_msg *msg) throw () { }
-        id_t start_timer(const session *s, int seconds) throw () { return 0; }
-};
 
 

natfw-nslp/trunk/eval/utils.cpp

@@ -8 +8 @@
 #include "utils.h"
 #include "msg/natfw_msg.h"
+#include "session_id.h"
 
 
@@ -79 +80 @@
 
 
+void nop_dispatcher::send_message(msg::ntlp_msg *msg) throw () {
+        DLog("nop_dispatcher", "sending " << *msg);
+
+        ntlp::APIMsg *apimsg = mapper.create_api_msg(msg);
+        apimsg->get_ghc();      // no-op to prevent compiler warning
+
+        // we don't really send the message, this is just a dummy method!
+
+        delete msg;
+}
+
+
+id_t nop_dispatcher::start_timer(const session *s, int seconds) throw () {
+        DLog("nop_dispatcher", "starting timer: " << seconds << "s from now");
+        return 0;
+}
+
+
 } // namespace natfw
 

natfw-nslp/trunk/eval/utils.h

@@ -8 +8 @@
 #include "network_message.h"
 #include "apimessage.h"
+#include "dispatcher.h"
 
 
@@ -19 +20 @@
 ntlp::APIMsg *build_api_create_msg();
 
+
+class nop_dispatcher : public dispatcher {
+  private:
+        gistka_mapper mapper;
+
+  public:
+        nop_dispatcher(session_manager *m, nat_manager *n,
+                        policy_rule_installer *p, natfw_config *c)
+                : dispatcher(m, n, p, c) { }
+
+        void send_message(msg::ntlp_msg *msg) throw ();
+
+        id_t start_timer(const session *s, int seconds) throw ();
+};
+
+
 }