Changeset 662

Timestamp:

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

Author:

smoku

Message:

Implemented My IP Address extension

Location:

trunk

Files:

• c2s/c2s.c (modified) (19 diffs)
• c2s/main.c (modified) (10 diffs)
• sx/Makefile.am (modified) (1 diff)
• sx/plugins.h (modified) (1 diff)
• sx/sx.c (modified) (4 diffs)
• sx/sx.h (modified) (1 diff)
• util/uri.h (modified) (1 diff)

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);

trunk/c2s/main.c

@@ -355 +355 @@
     switch(cb) {
         case sx_sasl_cb_GET_REALM:
-            
+
             if(s->req_to == NULL)   /* this shouldn't happen */
                 my_realm = "";
@@ -415 +415 @@
             return sx_sasl_ret_FAIL;
             break;
-        
+
         case sx_sasl_cb_CHECK_AUTHZID:
             creds = (sx_sasl_creds_t) arg;
@@ -495 +495 @@
                     return sx_sasl_ret_OK;
             }
-            
+
             r = snprintf(buf, sizeof(buf), "authreg.mechanisms.sasl.%s",mechbuf);
             if (r < -1 || r > sizeof(buf))
@@ -558 +558 @@
     union xhashv xhv;
     time_t check_time = 0;
-    
+
 #ifdef HAVE_UMASK
     umask((mode_t) 0027);
@@ -571 +571 @@
         WSADATA wsaData;
         int err;
-        
+
         wVersionRequested = MAKEWORD( 2, 2 );
-        
+
         err = WSAStartup( wVersionRequested, &wsaData );
         if ( err != 0 ) {
@@ -691 +691 @@
     }
 #endif
-            
+
     /* get sasl online */
     c2s->sx_sasl = sx_env_plugin(c2s->sx_env, sx_sasl_init, "xmpp", _c2s_sx_sasl_callback, (void *) c2s);
@@ -708 +708 @@
     /* get stanza ack up */
     sx_env_plugin(c2s->sx_env, sx_ack_init);
+
+    /* and user IP address plugin */
+    sx_env_plugin(c2s->sx_env, sx_address_init);
 #endif
 
@@ -758 +761 @@
             }
         }
-            
+
         /* cleanup dead sess (before sx_t as sess->result uses sx_t nad cache) */
         while(jqueue_size(c2s->dead_sess) > 0) {
@@ -808 +811 @@
                 }
             }
-    
+
             check_time = time(NULL);
         }
@@ -814 +817 @@
 
     log_write(c2s->log, LOG_NOTICE, "shutting down");
-    
+
     if(xhash_iter_first(c2s->sessions))
         do {

trunk/sx/Makefile.am

@@ -22 +22 @@
 
 if ENABLE_EXPERIMENTAL
-libsx_la_SOURCES += ack.c
+libsx_la_SOURCES += ack.c address.c
 endif

trunk/sx/plugins.h

@@ -148 +148 @@
 
 
-/* Stanza Acknowledgements plugin */
 #ifdef ENABLE_EXPERIMENTAL
 
+/* Stanza Acknowledgements plugin */
 /** init function */
 JABBERD2_API int                         sx_ack_init(sx_env_t env, sx_plugin_t p, va_list args);
+
+/* My IP Address plugin */
+/** init function */
+JABBERD2_API int                         sx_address_init(sx_env_t env, sx_plugin_t p, va_list args);
 
 #endif /* ENABLE_EXPERIMENTAL */

trunk/sx/sx.c

@@ -100 +100 @@
     if(s->auth_method != NULL) free(s->auth_method);
     if(s->auth_id != NULL) free(s->auth_id);
-    
+
     if(s->env != NULL) {
         _sx_debug(ZONE, "freeing %d env plugins", s->env->nplugins);
@@ -158 +158 @@
     temp.cb_arg = s->cb_arg;
 
+    temp.ip = s->ip;
     temp.flags = s->flags;
     temp.reentry = s->reentry;
@@ -185 +186 @@
 
     s->env = temp.env;
+    s->ip = temp.ip;
     s->flags = temp.flags;
     s->reentry = temp.reentry;
@@ -250 +252 @@
 {
     char *new_heap;
-    
+
     assert( before >= 0 );
     assert( after >= 0 );

trunk/sx/sx.h

@@ -247 +247 @@
     int                      tag;
 
+        /* IP address of the connection */
+        /* pointing to sess.ip and owned by sess structure */
+        char                    *ip;
+
     /* callback */
     sx_callback_t            cb;

trunk/util/uri.h

@@ -54 +54 @@
 #define uri_XDATA       "jabber:x:data"
 #define uri_OOB         "jabber:x:oob"
+#define uri_ADDRESS_FEATURE "http://affinix.com/jabber/address"
 
 /* these are used by SM mainly */