move to cloud service

README.md

@@ -2,12 +2,10 @@
 
 Homebrew Nintendo Switch NSP sysmodule for automatic upload of screen captures to remote server.
 
-Set host and port of a running server script in `/config/sys-screenuploader/config.ini`
+For instructions see [http://screenuploader.bakatrouble.me](https://screenuploader.bakatrouble.me)
 
-Server scripts are located in a `server` directory, feel free to make your ones and contribute to this repo.
+[Website repo](https://github.com/bakatrouble/sys-screenuploader-web)
 
-Currently implemented:
-* Telegram
 
 ### Credits
 

config.ini

@@ -1,3 +1,4 @@
 [server]
-host = home.bakatrouble.me
-port = 60666
+destination_id = undefined
+; host =
+; port =

include/config.hpp

@@ -7,8 +7,9 @@ using namespace std;
 
 class Config {
 public:
-    string host = "undefined";
-    long port = 0;
+    string destination_id = "undefined";
+    string host = "screenuploader.bakatrouble.me";
+    long port = 80;
 
     static Config load();
 };

src/config.cpp

@@ -13,8 +13,9 @@ Config Config::load() {
     }
 
     Config conf = {
-        reader.Get("server", "host", "undefined"),
-        reader.GetInteger("server", "port", 0)
+        reader.Get("server", "destination_id", "undefined"),
+        reader.Get("server", "host", "screenuploader.bakatrouble.me"),
+        reader.GetInteger("server", "port", 80),
     };
     return conf;
 }

src/sockets.cpp

@@ -15,6 +15,10 @@ u32 sendFileToServer(string &path, u32 size) {
     Config conf = Config::load();
     fs::path fpath(path);
 
+    if (conf.destination_id == "undefined") {
+        cout << "destination_id is not set in config" << endl;
+    }
+
     int sockfd = socket(AF_INET, SOCK_STREAM, 0);
 
     if (sockfd < 0) {
@@ -43,11 +47,12 @@ u32 sendFileToServer(string &path, u32 size) {
 	cout << "Building request" << endl;
 
 	stringstream ss;
-	ss << "POST /?filename=" << fpath.filename().string() << " HTTP/1.1\r\n"
+	ss << "POST /upload/" << conf.destination_id << "/?filename=" << fpath.filename().string() << " HTTP/1.1\r\n"
 	   << "Host: " << conf.host << ":" << conf.port << "\r\n"
 	   << "Content-Type: application/octet-stream\r\n"
 	   << "Content-Length: " << size << "\r\n"
 	   << "Content-Transfer-Encoding: binary\r\n"
+	   << "Connection: close\r\n"
 	   << "\r\n";
 	string request = ss.str();
 
@@ -69,6 +74,9 @@ u32 sendFileToServer(string &path, u32 size) {
         bytesSent += send(sockfd, buf, readSize, 0);
     }
 
+    int bytesRecv = recv(sockfd, buf, 0x2000u - 1, 0);
+    buf[bytesRecv] = 0;
+
     f.close();
     delete[] buf;