X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fex_filter_frontend_net.cpp;h=41813aff3257cddd939386d03d072ae4f57c2e4f;hb=a27375762602ee41a01282b59aae617c0764b38b;hp=4478afb5183fd45d43dbb92fca7a1ecc95b4f93b;hpb=5058e9bd89a991caaa45b6988d1da399892c32e9;p=metaproxy-moved-to-github.git

diff --git a/src/ex_filter_frontend_net.cpp b/src/ex_filter_frontend_net.cpp
index 4478afb..41813af 100644
--- a/src/ex_filter_frontend_net.cpp
+++ b/src/ex_filter_frontend_net.cpp
@@ -3,9 +3,13 @@
 #include <iostream>
 #include <stdexcept>
 
+#include <boost/program_options.hpp>
+namespace po = boost::program_options;
+
 #include "config.hpp"
 
 #include "filter_frontend_net.hpp"
+#include "filter_log.hpp"
 
 #include "router.hpp"
 #include "session.hpp"
@@ -23,13 +27,33 @@ public:
         Z_GDU *gdu = package.request().get();
         if (gdu)
         {
-            // std::cout << "Got PDU. Sending init response\n";
             ODR odr = odr_createmem(ODR_ENCODE);
-            Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
-            
-            apdu->u.initResponse->implementationName = "YP2/YAZ";
-            
-            package.response() = apdu;
+            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);
         }
         return package.move();
@@ -40,16 +64,52 @@ int main(int argc, char **argv)
 {
     try 
     {
+        po::options_description desc("Allowed options");
+        desc.add_options()
+            ("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::command_line_parser(argc, argv).
+                  options(desc).positional(p).run(), vm);
+        po::notify(vm);    
+
+        if (vm.count("help")) {
+            std::cout << desc << "\n";
+            return 1;
+        }
+
+        if (vm.count("port"))
         {
+            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";
+
 	    yp2::RouterChain router;
 
-            // put in frontend first
+            // put frontend filter in router
             yp2::FilterFrontendNet filter_front;
-            filter_front.listen_address() = "tcp:@:9999";
-            //filter_front.listen_duration() = 1;  // listen a short time only
+            filter_front.ports() = ports;
+
+            // 0=no time, >0 timeout in seconds
+            if (vm.count("duration")) {
+                filter_front.listen_duration() = vm["duration"].as<int>();
+            }
 	    router.rule(filter_front);
 
-            // put in a backend
+            // put log filter in router
+            yp2::FilterLog filter_log;
+            router.rule(filter_log);
+
+            // put backend init filter in router
             FilterInit filter_init;
 	    router.rule(filter_init);
 
@@ -64,6 +124,7 @@ int main(int argc, char **argv)
         std::cerr << "unknown exception\n";
         std::exit(1);
     }
+    std::exit(0);
 }
 
 /*