Changeset 24314

Timestamp:

10/14/13 20:34:45 (9 years ago)

Author:

obi

Message:

fix

Location:

titan/plugins/tithek

Files:

• filenuke.h (modified) (2 diffs)
• nowvideo.h (modified) (3 diffs)
• vidstream.h (modified) (2 diffs)

titan/plugins/tithek/filenuke.h

@@ -11 +11 @@
         
         if(host == NULL || file == NULL) return NULL;
+
+        unlink("/tmp/filenuke1_get");
+        unlink("/tmp/filenuke2_post");
+        unlink("/tmp/filenuke3_tmpstr1");
+        unlink("/tmp/filenuke4_post2");
+        unlink("/tmp/filenuke5_tmpstr2");
+        unlink("/tmp/filenuke6_b36code2");
+        unlink("/tmp/filenuke7_tmpstr_last");
+        unlink("/tmp/filenuke8_streamlink");
 
         tmphost = ostrcat("www.", host, 0, 0);
@@ -95 +104 @@
         send = ostrcat(send, hashlen, 1, 0);
         send = ostrcat(send, "\r\nAccept-Encoding: gzip\r\nConnection: close\r\nUser-Agent: Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.99 Safari/535.1\r\nHost: ", 1, 0);
-        send = ostrcat(send, host, 1, 0);
+        send = ostrcat(send, tmphost, 1, 0);
         send = ostrcat(send, "\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n", 1, 0);
         send = ostrcat(send, hash, 1, 0);

titan/plugins/tithek/nowvideo.h

@@ -19 +19 @@
         unlink("/tmp/nowvideo2_get");
 
-        tmphost = ostrcat(tmphost, host, 1, 0);
+        tmphost = ostrcat(host, NULL, 0, 0);
         tmpfile = ostrcat("/video/", file, 0, 0);
         
@@ -27 +27 @@
         debug(99, "tmpfile: %s", tmpfile);
 
-        send = ostrcat(send, "GET /video/", 1, 0);
-        send = ostrcat(send, file, 1, 0);
+        send = ostrcat(send, "GET ", 1, 0);
+        send = ostrcat(send, tmpfile, 1, 0);
         send = ostrcat(send, " HTTP/1.1\r\nHost: ", 1, 0);
-        send = ostrcat(send, host, 1, 0);
+        send = ostrcat(send, tmphost, 1, 0);
         send = ostrcat(send, "\r\nUser-Agent: Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.99 Safari/535.1\r\nConnection: close\r\nAccept-Encoding: gzip\r\n\r\n", 1, 0);
         debug(99, "send: %s", send);
@@ -66 +66 @@
         send = ostrcat(send, tmpfile, 1, 0);
         send = ostrcat(send, " HTTP/1.1\r\nHost: ", 1, 0);
-        send = ostrcat(send, host, 1, 0);
+        send = ostrcat(send, tmphost, 1, 0);
         send = ostrcat(send, "\r\nUser-Agent: Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.99 Safari/535.1\r\nConnection: close\r\nAccept-Encoding: gzip\r\n\r\n", 1, 0);
         debug(99, "send: %s", send);

titan/plugins/tithek/vidstream.h

@@ -25 +25 @@
         if(host == NULL || file == NULL) return NULL;
 
-        tmphost = ostrcat("www.", host, 0, 0);
-        tmpfile = ostrcat("/file/", file, 0, 0);
+        unlink("/tmp/vidstream1_get");
+        unlink("/tmp/vidstream2_post");
+        unlink("/tmp/vidstream3_streamlink");
+
+        tmphost = ostrcat(host, NULL, 0, 0);
+        tmpfile = ostrcat("/", file, 0, 0);
+        ip = get_ip(tmphost);
+        debug(99, "tmpfile: %s", tmpfile);
         debug(99, "tmphost: %s", tmphost);
-        ip = get_ip(tmphost);
         debug(99, "ip: %s", ip);
-        debug(99, "tmpfile: %s", tmpfile);
-        debug(99, "file: %s", file);
 
-        send = ostrcat(send, "GET /", 1, 0);
-        send = ostrcat(send, file, 1, 0);
+        send = ostrcat(send, "GET ", 1, 0);
+        send = ostrcat(send, tmpfile, 1, 0);
         send = ostrcat(send, " HTTP/1.1\r\nHost: ", 1, 0);      
-        send = ostrcat(send, host, 1, 0);
+        send = ostrcat(send, tmphost, 1, 0);
         send = ostrcat(send, "\r\nUser-Agent: Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.99 Safari/535.1\r\nConnection: close\r\nAccept-Encoding: gzip\r\n\r\n", 1, 0);        
-        debug(99, "tmphost: %s", tmphost);
-        debug(99, "tmpfile: %s", tmpfile);
         debug(99, "send: %s", send);
         tmpstr = gethttpreal(tmphost, tmpfile, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
-
-        titheklog(debuglevel, "/tmp/vidstream1_tmpstr", NULL, tmpstr);
+        debug(99, "tmpstr: %s", tmpstr);
+        titheklog(debuglevel, "/tmp/vidstream1_get", NULL, tmpstr);
 
         sleep(1);
@@ -108 +109 @@
         free(send), send = NULL;
 
-        send = ostrcat(send, "POST /", 1, 0);
-        send = ostrcat(send, file, 1, 0);
+        send = ostrcat(send, "POST ", 1, 0);
+        send = ostrcat(send, tmpfile, 1, 0);
         send = ostrcat(send, " HTTP/1.1\r\nContent-Length: ", 1, 0);
         send = ostrcat(send, hashlen, 1, 0);
         send = ostrcat(send, "\r\nAccept-Encoding: gzip\r\nConnection: close\r\nUser-Agent: Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.99 Safari/535.1\r\nHost: ", 1, 0);
-        send = ostrcat(send, host, 1, 0);
+        send = ostrcat(send, tmphost, 1, 0);
         send = ostrcat(send, "\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n", 1, 0);
         send = ostrcat(send, hash, 1, 0);
         debug(99, "send: %s", send);
 
-        free(tmpstr), tmpstr = NULL;
         tmpstr = gethttpreal(tmphost, tmpfile, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
-        
-        titheklog(debuglevel, "/tmp/vidstream2_tmpstr_post", NULL, tmpstr);
+        debug(99, "tmpstr: %s", tmpstr);        
+        titheklog(debuglevel, "/tmp/vidstream2_post", NULL, tmpstr);
 
         sleep(1);