Removed TYPE_CUSTOM from perl module.

Added TYPE_HTTPPOST to perl module.

diff --git a/OPM/OPM.xs b/OPM/OPM.xs
index 2b6ad5981febdc6b595a7347019f83a4662d1f03..d1a11d6592e8d42b04f5e04415b3f9d8ae7ac6b9 100644 (file)
--- a/OPM/OPM.xs
+++ b/OPM/OPM.xs
@@ -48,12 +48,12 @@ _defines define[] = {
    {"STATE_NEGSENT",        OPM_STATE_NEGSENT},
    {"STATE_UNESTABLISHED",  OPM_STATE_UNESTABLISHED},
    {"SUCCESS",              OPM_SUCCESS},
-   {"TYPE_CUSTOM",          OPM_TYPE_CUSTOM},
    {"TYPE_HTTP",            OPM_TYPE_HTTP},
    {"TYPE_ROUTER",          OPM_TYPE_ROUTER},
    {"TYPE_SOCKS4",          OPM_TYPE_SOCKS4},
    {"TYPE_SOCKS5",          OPM_TYPE_SOCKS5},
    {"TYPE_WINGATE",         OPM_TYPE_WINGATE},
+   {"TYPE_HTTPPOST",        OPM_TYPE_HTTPPOST},
    {NULL, 0},
 };
 
@@ -191,25 +191,6 @@ opm_addtype(scanner, type, port)
    OUTPUT:
        RETVAL
 
-OPM_Error
-opm_addcustom(scanner, type, string, port)
-       OPM_Scan *scanner   
-       SV* type
-       SV* string
-       int port
-   PREINIT:
-       STRLEN          typelen;
-       STRLEN          stringlen;
-   INPUT:
-       char *          stype = SvPV(type, typelen);
-       char *          sstring = SvPV(string, stringlen);
-   CODE:
-       RETVAL = opm_addcustom(scanner, stype, sstring, port);
-       if(RETVAL != OPM_SUCCESS)
-          error_check(RETVAL);
-   OUTPUT: 
-       RETVAL
-
 OPM_Error
 opm_scan(scanner, remote)
        OPM_Scan *scanner
@@ -296,15 +277,13 @@ SV *
 opm_remote_protocol(remote)
        OPM_Remote *remote
     CODE:
-       if(remote->protocol == OPM_TYPE_CUSTOM)
-          RETVAL = newSVpv("Custom", 0);
-       else
           switch(remote->protocol) {
              case OPM_TYPE_HTTP: RETVAL = newSVpv("HTTP", 0); break;
              case OPM_TYPE_SOCKS4: RETVAL = newSVpv("Socks4", 0); break;
              case OPM_TYPE_SOCKS5: RETVAL = newSVpv("Socks5", 0); break;
              case OPM_TYPE_WINGATE: RETVAL = newSVpv("WinGate", 0); break;
              case OPM_TYPE_ROUTER: RETVAL = newSVpv("Cisco", 0); break;
+             case OPM_TYPE_HTTPPOST: RETVAL = newSVpv("POST", 0); break;
           }
     OUTPUT:
        RETVAL

diff --git a/OPM/bopchecker.pl b/OPM/bopchecker.pl
index 674c5d710d77a461d80e768b41b26925940970be..11025751af972c0b143dccd73599645d04149fef 100644 (file)
--- a/OPM/bopchecker.pl
+++ b/OPM/bopchecker.pl
@@ -29,10 +29,9 @@ $scan->addtype(OPM->TYPE_SOCKS4, 1080);
 $scan->addtype(OPM->TYPE_SOCKS5, 1080);
 $scan->addtype(OPM->TYPE_ROUTER, 23);
 $scan->addtype(OPM->TYPE_WINGATE, 23);
-
-$scan->addcustom("HTTP Post", "POST http://%i:%p/ HTTP/1.0\r\nContent-type: text/plain\r\nContent-length: 5\r\n\r\nquit\r\n\r\n", 80);
-$scan->addcustom("HTTP Post", "POST http://%i:%p/ HTTP/1.0\r\nContent-type: text/plain\r\nContent-length: 5\r\n\r\nquit\r\n\r\n", 8080);
-$scan->addcustom("HTTP Post", "POST http://%i:%p/ HTTP/1.0\r\nContent-type: text/plain\r\nContent-length: 5\r\n\r\nquit\r\n\r\n", 3128);
+$scan->addtype(OPM->TYPE_HTTPPOST, 80);
+$scan->addtype(OPM->TYPE_HTTPPOST, 3128);
+$scan->addtype(OPM->TYPE_HTTPPOST, 8080);
 
 # XXX: make configurable           "lik-m-aid.blitzed.org"
 $scan->config(OPM->CONFIG_SCAN_IP, "203.56.139.100");

diff --git a/OPM/test.pl b/OPM/test.pl
index 00669591a1e8921a06752b8c6c9ab96c3015f679..804394664c58b75680d0f1d12c5798999bb18c49 100644 (file)
--- a/OPM/test.pl
+++ b/OPM/test.pl
@@ -27,8 +27,7 @@ $scan->addtype(OPM->TYPE_HTTP, 3128);
 $scan->addtype(OPM->TYPE_HTTP, 8080);
 $scan->addtype(OPM->TYPE_SOCKS4, 1080);
 $scan->addtype(OPM->TYPE_SOCKS5, 1080);
-
-$scan->addcustom("HTTP", "CONNECT %i:%p HTTP/1.0\r\n\r\n", 80);
+$scan->addtype(OPM->TYPE_HTTPPOST, 3128);
 
 $scan->config(OPM->CONFIG_SCAN_IP, "203.56.139.100");
 $scan->config(OPM->CONFIG_SCAN_PORT, 6667);

diff --git a/src/test.c b/src/test.c
index 02236d5380d06187baecca178f9212636dae78dd..261e89bfa6e8f7161a8ebc25a715daa2d414e8c1 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -38,6 +38,7 @@ void negotiation_failed(OPM_T *, OPM_REMOTE_T *, int, void *);
 void timeout(OPM_T *, OPM_REMOTE_T *, int, void *);
 void end(OPM_T *, OPM_REMOTE_T *, int, void *);
 void handle_error(OPM_T *, OPM_REMOTE_T *, int, void *);
+
 int complete = 0;
 
 int main(int argc, char **argv)
@@ -55,7 +56,7 @@ int main(int argc, char **argv)
    if(argc >= 2)
       remote  = opm_remote_create(argv[1]);
    else
-      remote  = opm_remote_create("208.245.162.250");
+      remote  = opm_remote_create("127.0.0.1");
 
    /* Setup callbacks */
    opm_callback(scanner, OPM_CALLBACK_OPENPROXY, &open_proxy, 0);