Changeset 151 for trunk

Timestamp:

03/26/10 03:50:38 (2 years ago)

Author:

mercyful

Message:

Updated Code to match latest ddTelnetd fixes.

Location:

trunk

Files:

• .anjuta_sym_db.db (modified) (previous)
• src/ddtelnetd/ddtelnetd.c (modified) (13 diffs)

trunk/src/ddtelnetd/ddtelnetd.c

@@ -76 +76 @@
 }
 
-int ignore = FALSE;
+int send_iac(unsigned char command, int option);
 
 int
 remove_iacs(unsigned char *in, int len, unsigned char* out, int* out_count) {
+        
         unsigned char *end = in + len;
         unsigned char* orig_in = in;
-
+        static int ignore = FALSE;
+   
         while (in < end) {
                 if (*in != IAC) {
@@ -89 +91 @@
                                 *out_count = *out_count + 1;
                         }
+                        else {
+                                in++;
+                        }
                 }
                 else {
@@ -95 +100 @@
                                 return 1;
                         }
+                        
+                        if(ignore && *(in+1) != SE) {
+                                send_iac(*(in+1), -1);
+                                in += 2;
+                                continue;
+                        }
+
+                        syslog(LOG_INFO, "got real IAC, %d, %d", *(in+1), *(in+2));
                         switch(*(in+1)) {
                         case IAC:
@@ -114 +127 @@
                         case SB:
                                 ignore = TRUE;
+                                syslog(LOG_INFO, "Negotiation began");
+                                in += 2;
                                 break;
                         case SE:
                                 ignore = FALSE;
                                 syslog(LOG_INFO, "Negotiation completed");
+                                in += 2;
                                 break;
                         case NOP:
@@ -128 +144 @@
                                 in += 2;
                                 break;
+                        case EC:
+                                in += 2;
+                                *out = '\b';
+                                ++out;
+                                *out_count = *out_count + 1;
+                                break;
                         default:
                                 syslog(LOG_INFO, "Unknown IAC arg: %d", *(in+1));
+                                in += 2;
                                 break;
                         }
@@ -141 +164 @@
 int send_iac(unsigned char command, int option)
 {
-        char buf[4];
+        char buf[3];
         int w;
-        sprintf(buf, "%c%c%c", (char) IAC, (char) command, (char) option);
-        w = write(OUTFD, buf, 3);
+        
+        buf[0] = IAC;
+        buf[1] = command;
+        buf[2] = option;
+        
+        w = write(OUTFD, buf, option == -1 ? 2 : 3);
+        
         return w;
 }
@@ -197 +225 @@
 
         /// Michael Griffin Get Host Address
-    /// From Remote Connection.
+    /// From Remote Connection, Pass Like in.telnetd does.
 
         fromlen = sizeof (from);
@@ -238 +266 @@
           exit(1);
         }
-        if(send_iac(DONT, TELOPT_NAWS) < 0) {
+        if(send_iac(WONT, TELOPT_NAWS) < 0) {
+          exit(1);
+        }
+        if(send_iac(WILL, TELOPT_BINARY) < 0) {
           exit(1);
         }
@@ -258 +289 @@
         }
         else if(pid == -1) {
-          closelog();
-          exit(1);
+            closelog();
+            exit(1);
         }
         else {
-          shell_pid = pid;
+            shell_pid = pid;
         }
 
@@ -274 +305 @@
 
                 selret = select(ptyfd + 1, &rdfdset, NULL, 0, 0);
-
-                if (selret < 0)
+                
+                if (selret <= 0)
                         break;
 
                 if (FD_ISSET(ptyfd, &rdfdset)) {
-                        unsigned char* ptr1, *ptr2;
+                        unsigned char* ptr1, *ptr2;     
                         int iacs = 0;
-                        int r;
-
-                        r = read(ptyfd, tmpbuf, BUFSIZE / 2);
-
-                        if ((r < 0 && errno != EINTR)) {
+                int r;
+                
+                r = read(ptyfd, tmpbuf, BUFSIZE / 2);
+                        
+                        if (r <= 0) {
                                 break;
                         }
@@ -303 +334 @@
                                 }
                         }
-
-                        if(write(OUTFD, buf, r + iacs) < 0) {
+                        
+                        if(write(OUTFD, buf, r + iacs) != (r + iacs)) {
                            break;
                         }
@@ -314 +345 @@
 
                         r = read(INFD, buf + new_offset, BUFSIZE - new_offset);
-
-                        if (r == 0 || (r < 0 && errno != EINTR)) {
+                                
+                        if (r <= 0) {
                                 break;
                         }
 
                         new_offset = remove_iacs(buf, r + new_offset, tmpbuf, &out_count);
-                        if(write(ptyfd, tmpbuf, out_count) < 0) {
+                        
+                        if(write(ptyfd, tmpbuf, out_count) != out_count) {
                            break;
                         }
@@ -327 +359 @@
         } while (1);
 
-        /* We will tell daydream to terminate probably (carrier lost) */
-        kill(shell_pid, SIGTERM);
-        wait4(shell_pid, NULL, 0, NULL);
         close(ptyfd);
+
+        syslog(LOG_INFO, "Closed connection");
         closelog();
-
-        syslog(LOG_INFO, "Closed connection");
-
+        
+        _exit(0);
+        
         return 1;
 }