Changeset 662 for trunk/c2s/c2s.c

Timestamp:

10/08/08 12:44:06 (5 months ago)

Author:

smoku

Message:

Implemented My IP Address extension

Files:

• trunk/c2s/c2s.c (modified) (19 diffs)

trunk/c2s/c2s.c

@@ -91 +91 @@
 
                 sx_kill(s);
-                
+
                 return -1;
             }
@@ -117 +117 @@
                     "Connection: close\r\n\r\n";
                 char *answer;
-    
+
                 len = strlen(sess->c2s->http_forward) + strlen(http);
                 answer = malloc(len * sizeof(char));
                 sprintf (answer, http, sess->c2s->http_forward);
-    
+
                 log_write(sess->c2s->log, LOG_NOTICE, "[%d] bouncing HTTP request to %s", sess->fd->fd, sess->c2s->http_forward);
-    
+
                 /* send HTTP answer */
                 len = send(sess->fd->fd, answer, len-1, 0);
 
                 free(answer);
-    
+
                 /* close connection */
                 sx_kill(s);
@@ -150 +150 @@
             if(MIO_WOULDBLOCK)
                 return 0;
-            
+
             if(s->state >= state_OPEN && sess->resources != NULL)
                 log_write(sess->c2s->log, LOG_NOTICE, "[%d] [%s] write error: %s (%d)", sess->fd->fd, jid_user(sess->resources->jid), MIO_STRERROR(MIO_ERROR), MIO_ERROR);
             else
                 log_write(sess->c2s->log, LOG_NOTICE, "[%d] [%s. port=%d] write error: %s (%d)", sess->fd->fd, sess->ip, sess->port, MIO_STRERROR(MIO_ERROR), MIO_ERROR);
-        
+
             sx_kill(s);
-        
+
             return -1;
 
@@ -168 +168 @@
 
             break;
-            
+
         case event_STREAM:
 
@@ -272 +272 @@
                         log_debug(ZONE, "invalid jid data");
                         sx_nad_write(sess->s, stanza_error(nad, 0, stanza_err_BAD_REQUEST));
-                        
+
                         return 0;
                     }
@@ -344 +344 @@
                     log_debug(ZONE, "no/empty resource given to unbind");
                     sx_nad_write(sess->s, stanza_error(nad, 0, stanza_err_BAD_REQUEST));
-                        
+
                     return 0;
                 }
@@ -352 +352 @@
                     log_debug(ZONE, "cannot resourceprep");
                     sx_nad_write(sess->s, stanza_error(nad, 0, stanza_err_BAD_REQUEST));
-                    
+
                     return 0;
                 }
@@ -364 +364 @@
                     log_debug(ZONE, "resource /%s not bound", resource_buf);
                     sx_nad_write(sess->s, stanza_error(nad, 0, stanza_err_ITEM_NOT_FOUND));
-                    
+
                     return 0;
                 }
@@ -446 +446 @@
                         log_debug(ZONE, "packet without 'from' on multiple resource stream");
                     }
-    
+
                     sx_nad_write(sess->s, stanza_error(nad, 0, stanza_err_UNKNOWN_SENDER));
-    
+
                     return 0;
                 }
@@ -458 +458 @@
 
             break;
-        
+
         case event_OPEN:
 
@@ -593 +593 @@
             if(c2s->stanza_rate_total != 0)
                 sess->stanza_rate = rate_new(c2s->stanza_rate_total, c2s->stanza_rate_seconds, c2s->stanza_rate_wait);
+
+            /* give IP to SX */
+            sess->s->ip = sess->ip;
 
             /* find out which port this is */
@@ -667 +670 @@
                 }
             } while(xhash_iter_next(c2s->sessions));
-        
+
         xhash_zap(c2s->sm_avail, from);
     }
@@ -708 +711 @@
 
                 sx_kill(s);
-                
+
                 return -1;
             }
@@ -738 +741 @@
 
             log_write(c2s->log, LOG_NOTICE, "[%d] [router] write error: %s (%d)", c2s->fd->fd, MIO_STRERROR(MIO_ERROR), MIO_ERROR);
-        
+
             sx_kill(s);
-        
+
             return -1;
 
@@ -847 +850 @@
                     } else
                         c2s->server_fd = NULL;
-            
+
 #ifdef HAVE_SSL
                     if(c2s->local_ssl_port != 0 && c2s->local_pemfile != NULL) {
@@ -869 +872 @@
                     exit(1);
                 }
-            
+
                 /* we're online */
                 c2s->online = c2s->started = 1;
@@ -1051 +1054 @@
                     if(sess->bound < 1){
                         sess->active = 0;
-                    
+
                         /* return the unbind result to the client */
                         if(sess->result != NULL) {
@@ -1060 +1063 @@
                         if(replaced)
                             sx_error(sess->s, stream_err_CONFLICT, NULL);
-                        
+
                         /* close them */
                         sx_close(sess->s);
-    
+
                         nad_free(nad);
                         return 0;
@@ -1138 +1141 @@
                             ires->next = bres->next;
                         }
-    
+
                         jid_free(bres->jid);
                         free(bres);