X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fex_filter_frontend_net.cpp;h=02383e1e15dc15d02c5ea6769ed6044a59a0b64d;hb=ea0a0e72e69c954962d25f92522bf0eb20281ec5;hp=4ae21fa50a0778cc1be4ea1acef8828ec4b75fb7;hpb=fb02f5d8ceb8c0062dd976626c8517f7d78280ea;p=metaproxy-moved-to-github.git

diff --git a/src/ex_filter_frontend_net.cpp b/src/ex_filter_frontend_net.cpp
index 4ae21fa..02383e1 100644
--- a/src/ex_filter_frontend_net.cpp
+++ b/src/ex_filter_frontend_net.cpp
@@ -1,3 +1,10 @@
+/* $Id: ex_filter_frontend_net.cpp,v 1.28 2006-09-29 08:42:47 marc Exp $
+   Copyright (c) 2005-2006, Index Data.
+
+   See the LICENSE file for details
+ */
+
+#include "config.hpp"
 
 #include <cstdlib>
 #include <iostream>
@@ -6,54 +13,43 @@
 #include <boost/program_options.hpp>
 namespace po = boost::program_options;
 
-#include "config.hpp"
 
+#include "util.hpp"
 #include "filter_frontend_net.hpp"
+#include "filter_z3950_client.hpp"
+#include "filter_virt_db.hpp"
+#include "filter_session_shared.hpp"
+#include "filter_log.hpp"
 
-#include "router.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
-class FilterInit: public yp2::Filter {
-public:
-    void process(yp2::Package & package) const {
+namespace mp = metaproxy_1;
 
+class HTTPFilter: public mp::filter::Base {
+public:
+    void process(mp::Package & package) const {
         if (package.session().is_closed())
         {
             // std::cout << "Got Close.\n";
         }
-       
+        
         Z_GDU *gdu = package.request().get();
-        if (gdu)
+        if (gdu && gdu->which == Z_GDU_HTTP_Request)
         {
-            ODR odr = odr_createmem(ODR_ENCODE);
-            switch(gdu->which)
-            {
-            case Z_GDU_Z3950:
-                // std::cout << "Got PDU. Sending init response\n";
-                Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
-                
-                apdu->u.initResponse->implementationName = "YP2/YAZ";
-                
-                package.response() = apdu;
-                break;
-            case Z_GDU_HTTP_Request:
-                Z_GDU *gdu = z_get_HTTP_Response(odr, 200);
-                Z_HTTP_Response *http_res = gdu->u.HTTP_Response;
-        
-                z_HTTP_header_add(odr, &http_res->headers,
-                                  "Content-Type", "text/plain");
-           
-                http_res->content_buf = 
-                    odr_strdup(odr, "Welcome to YP2");
-                http_res->content_len = strlen(http_res->content_buf);
-
-                package.response() = gdu;
-                break;
-            default:
-                break;
-            } 
-            odr_destroy(odr);
+            mp::odr odr;
+            Z_GDU *gdu = z_get_HTTP_Response(odr, 200);
+            Z_HTTP_Response *http_res = gdu->u.HTTP_Response;
+            
+            z_HTTP_header_add(odr, &http_res->headers,
+                              "Content-Type", "text/plain");
+            
+            http_res->content_buf = 
+                odr_strdup(odr, "Welcome to YP2");
+            http_res->content_len = strlen(http_res->content_buf);
+            
+            package.response() = gdu;
         }
         return package.move();
     };
@@ -68,10 +64,15 @@ int main(int argc, char **argv)
             ("help", "produce help message")
             ("duration", po::value<int>(),
              "number of seconds for server to exist")
+            ("port", po::value< std::vector<std::string> >(), "listener port")
             ;
 
+        po::positional_options_description p;
+        p.add("port", -1);
+
         po::variables_map vm;        
-        po::store(po::parse_command_line(argc, argv, desc), vm);
+        po::store(po::command_line_parser(argc, argv).
+                  options(desc).positional(p).run(), vm);
         po::notify(vm);    
 
         if (vm.count("help")) {
@@ -79,27 +80,56 @@ int main(int argc, char **argv)
             return 1;
         }
 
+        if (vm.count("port"))
         {
-	    yp2::RouterChain router;
+            std::vector<std::string> ports = 
+                vm["port"].as< std::vector<std::string> >();
+
+            for (size_t i = 0; i<ports.size(); i++)
+                std::cout << "port " << i << " " << ports[i] << "\n";
 
-            // put in frontend first
-            yp2::FilterFrontendNet filter_front;
-            filter_front.listen_address() = "tcp:@:9999";
+	    mp::RouterChain router;
+
+            // put frontend filter in router
+            mp::filter::FrontendNet filter_front;
+            filter_front.ports() = ports;
 
             // 0=no time, >0 timeout in seconds
             if (vm.count("duration")) {
-                filter_front.listen_duration() = 
-                    vm["duration"].as<int>();
+                filter_front.listen_duration() = vm["duration"].as<int>();
             }
-	    router.rule(filter_front);
-
-            // put in a backend
-            FilterInit filter_init;
-	    router.rule(filter_init);
-
-            yp2::Session session;
-            yp2::Origin origin;
-	    yp2::Package pack(session, origin);
+	    router.append(filter_front);
+
+            // put log filter in router
+            mp::filter::Log filter_log_front("FRONT");
+            router.append(filter_log_front);
+
+            // put Virt db filter in router
+            mp::filter::VirtualDB filter_virt_db;
+            filter_virt_db.add_map_db2target("gils", "indexdata.dk/gils",
+                                            "");
+            filter_virt_db.add_map_db2target("Default", "localhost:9999/Default",
+                                            "");
+            filter_virt_db.add_map_db2target("2", "localhost:9999/Slow", "");
+	    router.append(filter_virt_db);
+
+            mp::filter::SessionShared filter_session_shared;
+            //router.append(filter_session_shared);
+
+            mp::filter::Log filter_log_back("BACK");
+            router.append(filter_log_back);
+
+            // put HTTP backend filter in router
+            HTTPFilter filter_init;
+	    router.append(filter_init);
+
+            // put Z39.50 backend filter in router
+            mp::filter::Z3950Client z3950_client;
+	    router.append(z3950_client);
+
+            mp::Session session;
+            mp::Origin origin;
+	    mp::Package pack(session, origin);
 	    
 	    pack.router(router).move(); 
         }
@@ -115,6 +145,7 @@ int main(int argc, char **argv)
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */