-- Leo's gemini proxy

-- Connecting to git.thebackupbox.net:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini

repo: tlswrap
action: commit
revision:
path_from:
revision_from: cc99611f40176ef92de732f656c6617e662dd0f2:
path_to:
revision_to:

commit cc99611f40176ef92de732f656c6617e662dd0f2
Author: epoch <epoch@thebackupbox.net>
Date:   Wed Nov 16 04:01:19 2022 +0000

    stupid size_t being unsigned and me not using int like I should have

diff --git a/tlswrap.c b/tlswrap.c

--- a/tlswrap.c
+++ b/tlswrap.c
@@ -332,7 +332,6 @@ int main(int argc,char *argv[]) {
   }
   //fprintf(stderr,"made it here\n");
   syslog(LOG_DAEMON|LOG_DEBUG,"accepted a connection!");
-  size_t r;
   char buffer[65535];//fuck it. let's make it big.

   if(servername && servername[0]) {
@@ -373,7 +372,9 @@ int main(int argc,char *argv[]) {
   }
   //fprintf(stderr,"made it here\n");
   int j;
+  int r1;
   int r2;
+  int r3;
   int fdmax=0;
   fd_set master;
   fd_set readfs;
@@ -396,19 +397,16 @@ int main(int argc,char *argv[]) {
       break;
     }
     if(FD_ISSET(0,&readfs)) {
-      if((r=SSL_read(ssl,buffer,sizeof(buffer))) <= 0) {
-        syslog(LOG_DAEMON|LOG_DEBUG,"SSL done. %d msg: %s",r,ERR_error_string(ERR_get_error(),NULL));
-        if(write(a[1],buffer,r) < 0) {
-          syslog(LOG_DAEMON|LOG_ERR,"write failed. -_-");
-        }
+      if((r1=SSL_read(ssl,buffer,sizeof(buffer))) <= 0) {
+        syslog(LOG_DAEMON|LOG_DEBUG,"SSL done. %d msg: %s",r1,ERR_error_string(ERR_get_error(),NULL));
         FD_CLR(0,&master);
 	close(a[1]);
 	close(0);
       } else {
-        syslog(LOG_DAEMON|LOG_DEBUG,"SSL read? %d msg: %s",r,ERR_error_string(ERR_get_error(),NULL));
-        syslog(LOG_DAEMON|LOG_DEBUG,"read %d bytes from ssl!",r);
-        if(write(a[1],buffer,r) < 0) {
-          syslog(LOG_DAEMON|LOG_ERR,"a write failed. -_-");
+        syslog(LOG_DAEMON|LOG_DEBUG,"SSL read? %d msg: %s",r1,ERR_error_string(ERR_get_error(),NULL));
+        syslog(LOG_DAEMON|LOG_DEBUG,"read %d bytes from ssl!",r1);
+        if((r3=write(a[1],buffer,r1) < 0)) {
+          syslog(LOG_DAEMON|LOG_ERR,"a write failed. -_- %d",r3);
         }
       }
     }
@@ -420,8 +418,8 @@ int main(int argc,char *argv[]) {
 	close(1);
       } else {
         syslog(LOG_DAEMON|LOG_DEBUG,"read %d bytes from subprocess!",r2);
-        if(SSL_write(ssl,buffer,r2) <= 0) {
-          syslog(LOG_DAEMON|LOG_ERR,"SSL_write had an error: %s",ERR_error_string(ERR_get_error(),NULL));
+        if((r3=SSL_write(ssl,buffer,r2)) <= 0) {
+          syslog(LOG_DAEMON|LOG_ERR,"SSL_write had an error: %d %s",r3,ERR_error_string(ERR_get_error(),NULL));
         }
       }
     }

-- Response ended

-- Page fetched on Sun Jun 2 18:17:46 2024