Diff: modem.cpp

Revision:

4:13ff9c81dc10

Parent:

3:9598af355293

Child:

5:7801f913384e

--- a/modem.cpp	Mon May 22 20:08:46 2017 +0000
+++ b/modem.cpp	Fri Jun 02 13:31:56 2017 +0000
@@ -216,17 +216,19 @@
         return 0;
     }        
     
+    
     //Monta Header aqui!
-    sprintf(header,"--xxBOUNDARYxx\nContent-Type: text/plain\nContent-Disposition: form-data; name=\"IMEI\"\n\n%s\n--xxBOUNDARYxx\nContent-Type: application/octet-stream\nContent-Disposition: form-data; name=\"file\"; filename=\"%s\"\n\n",modemCom::status.MAC,arquivo->nome);
+    //application/octet-stream
+    sprintf(header,"--xxBOUNDARYxx\r\nContent-Type: text/plain\r\nContent-Disposition: form-data; name=\"IMEI\"\r\n\r\n%s\r\n--xxBOUNDARYxx\r\nContent-Type: application/octet-stream\r\nContent-Disposition: form-data; name=\"file\"; filename=\"%s\"\r\n\r\n",modemCom::status.MAC,arquivo->nome);
     
     dataTam = strlen(header);   
     dataTam+=arquivo->bytes;
-    dataTam+= strlen("\n--xxBOUNDARYxx--");
+    dataTam+= strlen("\r\n--xxBOUNDARYxx--");
     //"/drome/parser/index.php" uri drome
-    sprintf(header,"POST %s HTTP/1.1\nHost: %s\nContent-Type: multipart/form-data; boundary=xxBOUNDARYxx\nContent-Length: %lu\n\n",uri,host,dataTam); 
+    sprintf(header,"POST %s HTTP/1.1\r\nHost: %s\r\nContent-Type: multipart/form-data; boundary=xxBOUNDARYxx\r\nContent-Length: %lu\r\n\r\n",uri,host,dataTam); 
     headerTam = strlen(header); //Pego o tamanho parcial para fazer a concatenaçao a fim de predizer o tamanho do post total
     
-    sprintf(&header[headerTam],"--xxBOUNDARYxx\nContent-Type: text/plain\nContent-Disposition: form-data; name=\"IMEI\"\n\n%s\n--xxBOUNDARYxx\nContent-Type: application/octet-stream\nContent-Disposition: form-data; name=\"file\"; filename=\"%s\"\n\n",modemCom::status.MAC,arquivo->nome);
+    sprintf(&header[headerTam],"--xxBOUNDARYxx\r\nContent-Type: text/plain\r\nContent-Disposition: form-data; name=\"IMEI\"\r\n\r\n%s\r\n--xxBOUNDARYxx\r\nContent-Type: application/octet-stream\r\nContent-Disposition: form-data; name=\"file\"; filename=\"%s\"\r\n\r\n",modemCom::status.MAC,arquivo->nome);
     headerTam = strlen(header);
 
     sprintf(aux,"AT+CIPSEND=1,%u\r\n",headerTam);
@@ -263,7 +265,7 @@
                     c = fgetc(arquivo->fp);                    
                     modem.printf("%c",c);
                     #ifdef xereta_modem
-                        pc.printf("Escrevendo<%c>",c);
+                        pc.printf("%c",c);
                     #endif
                 }
 
@@ -304,7 +306,7 @@
     passaParaProximaParte = false;
     maxTentativas = maxRetentativasEnvioParteArquivo;
     while((maxTentativas)&&(!passaParaProximaParte)) {
-        sprintf(aux,"AT+CIPSEND=1,%u\r\n",restoDoEnvio+strlen("\n--xxBOUNDARYxx--\n\n")); //Para incluir "\n--xxBOUNDARYxx--\n\n" no fim da msg http
+        sprintf(aux,"AT+CIPSEND=1,%u\r\n",restoDoEnvio+strlen("\r\n--xxBOUNDARYxx--\r\n\r\n")); //Para incluir "\n--xxBOUNDARYxx--\n\n" no fim da msg http
         if(modemCom::sendToModem(aux,1,&modemCom::status.PROMPT_ENVIO_COMMAND_MODE,100,3)) {
             for(numeroByteSendoEnviado=0; numeroByteSendoEnviado<restoDoEnvio; numeroByteSendoEnviado++) {
                 //Envio os bytes aqui! Menos o ultimo para ter o check;
@@ -314,7 +316,7 @@
                     pc.printf("%c",c);
                 #endif
             }
-            if(modemCom::sendToModem("\n--xxBOUNDARYxx--\n\n",1,&modemCom::status.SEND_OK,5000,1)) {
+            if(modemCom::sendToModem("\r\n--xxBOUNDARYxx--\r\n\r\n",1,&modemCom::status.SEND_OK,5000,1)) {
                 if(numeroDePartes) {
                     diversos::progressBar(parteSendoEnviada,numeroDePartes);
                 }