DistRen Changeset - 39b02c5f3c1b · protofusion repositories

Changeset - 39b02c5f3c1b

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Nathan Brink (binki) - 15 years ago 2010-07-02 01:48:14
ohnobinki@ohnopublishing.net

4 files changed with 38 insertions and 28 deletions:

configure.ac

src/server/distrend.c

src/server/listen.c

src/server/listen.h

0 comments (0 inline, 0 general)

configure.ac

➞

Show inline comments

@@ @@ -16,7 +16,7 @@ @@
 # along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.61)
 AC_INIT([distren],[0.0],[http://bugs.ohnopub.net/])
+AC_INIT([distren],[0.0],[http://bugs.ohnopub.net/], [], [http://ohnopub.net/distren/])
 AC_CONFIG_SRCDIR([src/server/distrend.c])
 AC_CONFIG_MACRO_DIR([m4])

src/server/distrend.c

➞

Show inline comments

@@ @@ -85,6 +85,10 @@ int distrend_do_config(int argc, char *a @@
 int distrend_config_free(struct distrend_config *config);
 int distrend_handle_request(struct distrend_listens *listens, struct distrend_client *client, struct distren_request *req, void *reqdata, struct general_info *geninfo);
 /**
    client request handlers
  */
 int distrend_handle_version(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data);
 /* **************XML Functions**************** */
 void update_general_info(struct general_info *geninfo);
@@ @@ -170,6 +174,8 @@ int main(int argc, char *argv[]) @@
+	}
+    }
   distrend_listen_handler_add(general_info.config->listens, DISTREN_REQUEST_VERSION, &distrend_handle_version);
   int slaveKey = 0; // Remotio should set me on a per-slave basis
   /* Main Loop */
   general_info.config->die = 0;
@@ @@ -219,31 +225,32 @@ int main(int argc, char *argv[]) @@
 /* ********************** Functions ************************* */
-int distrend_handle_request(struct distrend_listens *listens, struct distrend_client *client, struct distren_request *req, void *reqdata, struct general_info *geninfo)
+int distrend_handle_version(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data)
+{
   size_t counter;
   char *tmp_str;
   char fixedbuf[32];
   /* for response requests... if that makes any less sense ;-) */
   struct distren_request *newreq;
   fprintf(stderr, "I can haz data %d bytes long:", req->len);
   for(counter = 0; counter < req->len; counter ++)
     fputc(((char *)reqdata)[counter], stderr);
   fputc('\n', stderr);
   switch(req->type)
   if(client->state != DISTREND_CLIENT_PREVERSION)
+    {
     case DISTREN_REQUEST_VERSION:
       if(strlen(PACKAGE_STRING) == req->len
 	 && !strncmp(PACKAGE_STRING, reqdata, req->len))
       distrend_send_disconnect(geninfo->config->listens, client, "You have already sent the VERSION command.");
+    }
   if(strlen(PACKAGE_STRING) == req_len
      && !strncmp(PACKAGE_STRING, req_data, req_len))
+	{
 	  /**
 	     The client and I claim to be of the same version of distren :-D
 	     Now we will mark the client as valid.
 	 We won't increment his time to live, though, because it shouldn't take
 	 him that long to auth.
 	   */
       client->state = DISTREND_CLIENT_PREAUTH;
       distren_request_new(&newreq, strlen(PACKAGE_STRING), DISTREN_REQUEST_VERSION);
       distrend_client_write_request(geninfo->config->listens, client, newreq, PACKAGE_STRING);
       distren_request_free(newreq);
+	}
       else
+	{
@@ @@ -251,19 +258,13 @@ int distrend_handle_request(struct distr @@
 	     The client claims to be of a different version of distren.
 	     Now we will just send a disconnect packet and disconnect the client.
 	   */
-	  strncpy(fixedbuf, reqdata, 31);
+      strncpy(fixedbuf, req_data, 31);
 	  fixedbuf[31] = '\0';
 	  if(req->len < 31)
 	    fixedbuf[req->len] = '\0';
       if(req_len < 31)
 	fixedbuf[req_len] = '\0';
 	  _distren_asprintf(&tmp_str, "You have tried to connect to a %s server when your client claims to be running %s. Bye ;-)\n", PACKAGE_STRING, fixedbuf);
 	  distrend_send_disconnect(listens, client, tmp_str);
+	}
       distren_request_new(&newreq, strlen(VERSION), DISTREN_REQUEST_VERSION);
       distrend_client_write_request(listens, client, newreq, VERSION);
       distren_request_free(newreq);
       break;
       distrend_send_disconnect(geninfo->config->listens, client, tmp_str);
+    }
   return 0;

src/server/listen.c

➞

Show inline comments

@@ @@ -182,8 +182,6 @@ int distrend_handleread(struct distrend_ @@
   packet->len = 0;
   packet->data = NULL;
   //  if(revents & POLLRDNORM)
   //{
       readlen = read(client->sock.sock, buf, sizeof(buf));
       if(readlen == -1)
+	{
@@ @@ -223,7 +221,6 @@ int distrend_handleread(struct distrend_ @@
       q_enqueue(client->inmsgs, packet, 0);
       client->inlen += packet->len;
       packet = NULL;
       //    } /*  */
   /**
      Manage input, etc.
@@ @@ -313,6 +310,9 @@ int distrend_accept_client_proc(struct d @@
   if(data->current_time > client->cleanup_time)
     switch(client->state)
+      {
       case DISTREND_CLIENT_PREVERSION:
 	distrend_send_disconnect(data->listens, client, "You have failed to present version information in a timely manner. Cya :-p");
 	break;
       case DISTREND_CLIENT_PREAUTH:
 	distrend_send_disconnect(data->listens, client, "You have failed to present authentication information in a timely manner. Cya ;-)");
 	break;
@@ @@ -397,7 +397,7 @@ int distrend_accept_newclient_proc(struc @@
   if(revents & POLLRDNORM)
+    {
       newclientsock = accept(listen_sock->sock.sock, (struct sockaddr *)NULL, (socklen_t *)NULL);
-      if(distrend_client_add(listens, newclientsock, DISTREND_CLIENT_PREAUTH))
+      if(distrend_client_add(listens, newclientsock, DISTREND_CLIENT_PREVERSION))
+	{
 	  fprintf(stderr, "error allocating/adding client struct\n");
 	  return 1;
@@ @@ -518,7 +518,12 @@ int distrend_client_add(struct distrend_ @@
   /**
      For those using netcat/telnet to debug their internets.
    */
   distrend_client_write(listens, client, "distren\n", 8);
 #ifndef PACKAGE_URL
 #define PACKAGE_URL "http://ohnopub.net/distren/"
 #endif
 #define DISTREN_GREETING PACKAGE_STRING " " PACKAGE_URL " : Nathan Phillip Brink && Ethan Michael Zonca\n"
   /* using sizeof() - 1 because the sizeof() includes a NULL byte we want to ignore. */
   distrend_client_write(listens, client, DISTREN_GREETING, sizeof(DISTREN_GREETING) - 1);
   return 0;
+}

src/server/listen.h

➞

Show inline comments

@@ @@ -49,6 +49,10 @@ struct distrend_client; @@
 enum distrend_client_state
+  {
     /**
        The client hasn't yet given us its version.
      */
     DISTREND_CLIENT_PREVERSION,
     /**
        We don't yet know the client. It may only use authentication
        commands.
      */

0 comments (0 inline, 0 general)