Changeset 24310 for titan/plugins/tithek/streamcloud.h

Timestamp:

10/14/13 18:36:57 (10 years ago)

Author:

obi

Message:

fix

File:

• titan/plugins/tithek/streamcloud.h (modified) (4 diffs)

titan/plugins/tithek/streamcloud.h

@@ -6 +6 @@
         debug(99, "in host: %s file: %s", host, file);
         int debuglevel = getconfigint("debuglevel", NULL);
-        char* tmphost = NULL;
-        char* tmpfile = NULL;
-        char* tmpstr = NULL;
-        char* send = NULL;
-        char* id = NULL;
-        char* fname = NULL;
-        char* op = NULL;
-        char* hash = NULL;
-        char* hashline = NULL;
-        char* hashlen = NULL;
-        char* referer = NULL;
-        char* usr_login = NULL;
-        char* imhuman = NULL;   
-        char* ip = NULL;
-        char* cookie = NULL;
-        char* cmd = NULL;
-        char* streamlink = NULL;
+        char* tmphost = NULL, *tmpfile = NULL, *tmpstr = NULL, *send = NULL, *id = NULL, *fname = NULL, *op = NULL, *hash = NULL, *cmd = NULL;
+        char* hashline = NULL, *hashlen = NULL, *referer = NULL, *usr_login = NULL, *imhuman = NULL, *ip = NULL, *cookie = NULL, *streamlink = NULL;
+
+        unlink("/tmp/streamcould1_get");
+        unlink("/tmp/streamcould2_post");
+        unlink("/tmp/streamcould3_streamlink");
 
         if(host == NULL || file == NULL) return NULL;
 
-        tmphost = ostrcat(tmphost, host, 1, 0);
+        tmphost = ostrcat(host, NULL, 0, 0);
         tmpfile = ostrcat("/", file, 0, 0);
-        
+
         debug(99, "tmphost: %s", tmphost);
         ip = get_ip(tmphost);
@@ -34 +23 @@
         debug(99, "tmpfile: %s", tmpfile);
 
-        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, "send: %s", send);
 
         tmpstr = gethttpreal(tmphost, tmpfile, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
-
-        if(getconfigint("debuglevel", NULL) == 99)
-                writesys("/tmp/streamcould1_tmpstr", tmpstr, 0);
-/*
-        old code        
-        cmd = ostrcat(cmd, "echo -e \"", 1, 0);
-        cmd = ostrcat(cmd, send, 1, 0);
-        cmd = ostrcat(cmd, "\" | /var/usr/local/share/titan/plugins/tithek/netcat ", 1, 0);
-        cmd = ostrcat(cmd, host, 1, 0); 
-        cmd = ostrcat(cmd, " 80", 1, 0);
-        debug(99, "cmd: %s", cmd);
-        free(tmpstr), tmpstr = NULL;
-        tmpstr = command(cmd);
-*/
+        free(send), send = NULL;
+        debug(99, "tmpstr: %s", tmpstr);
+        sleep(20);
+        titheklog(debuglevel, "/tmp/streamcould1_get", NULL, tmpstr);
+        
         cookie = string_resub("Set-Cookie: afc=", ";", tmpstr, 0);      
         debug(99, "cookie: %s", cookie);
- 
-        sleep(20);
 
         //get hash from tmpstr
@@ -107 +85 @@
         hashlen = oitoa(strlen(hash));
 
-        //create send string
-        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\nCookie: afc=", 1, 0);
         send = ostrcat(send, cookie, 1, 0);
@@ -122 +97 @@
         debug(99, "send: %s", send);
 
-        free(tmpstr), tmpstr = NULL;
-        tmpstr = gethttpreal(tmphost, tmpfile, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 0);
-        titheklog(debuglevel, "/tmp/streamcould2_tmpstr_post", NULL, tmpstr);
+        tmpstr = gethttpreal(tmphost, tmpfile, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
+        free(send), send = NULL;
+        debug(99, "tmpstr: %s", tmpstr);
+        titheklog(debuglevel, "/tmp/streamcould2_post", NULL, tmpstr);
 
 //      streamlink = oregex(".*file: \".*(http:.*video.mp4).*\".*", tmpstr);
         streamlink = string_resub("file: \"", "\"", tmpstr, 0);
         titheklog(debuglevel, "/tmp/streamcould3_streamlink", NULL, streamlink);
-
-        free(tmpstr); tmpstr = NULL;
 
 end: