X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fex_filter_frontend_net.cpp;h=f5c16ed61788f617746dbf3299907d5834a3b62b;hb=8ced8e7b5de3ecba12ac68ce5c5e8cddf40d800f;hp=bf74d11d90af273eaa1cb0c47a3ac3d07116d0aa;hpb=e9530d6289df9b848e4901d7c73f5a2f27706d66;p=metaproxy-moved-to-github.git diff --git a/src/ex_filter_frontend_net.cpp b/src/ex_filter_frontend_net.cpp index bf74d11..f5c16ed 100644 --- a/src/ex_filter_frontend_net.cpp +++ b/src/ex_filter_frontend_net.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2008 Index Data + Copyright (C) 2005-2013 Index Data Metaproxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include -#include "util.hpp" +#include #include "filter_frontend_net.hpp" #include "filter_z3950_client.hpp" #include "filter_virt_db.hpp" @@ -31,8 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "filter_log.hpp" #include "router_chain.hpp" -#include "session.hpp" -#include "package.hpp" +#include namespace mp = metaproxy_1; @@ -43,37 +42,39 @@ public: { // std::cout << "Got Close.\n"; } - + Z_GDU *gdu = package.request().get(); if (gdu && gdu->which == Z_GDU_HTTP_Request) { 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_buf = + odr_strdup(odr, "Welcome to Metaproxy"); http_res->content_len = strlen(http_res->content_buf); - + package.response() = gdu; } return package.move(); }; + void configure(const xmlNode * ptr, bool test_only, + const char *path) { }; }; int main(int argc, char **argv) { - try + try { std::vector ports; int duration = -1; int ret; char *arg; - while ((ret = options("h{help}d{duration}:p{port}:", + while ((ret = options("h{help}d{duration}:p{port}:", argv, argc, &arg)) != -2) { switch(ret) @@ -141,8 +142,8 @@ int main(int argc, char **argv) mp::Session session; mp::Origin origin; mp::Package pack(session, origin); - - pack.router(router).move(); + + pack.router(router).move(); } } catch ( ... ) { @@ -155,8 +156,9 @@ int main(int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +