DistRen Changeset - e22839d03ac9 · protofusion repositories

Changeset - e22839d03ac9

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 15 years ago 2010-07-02 12:13:57
ohnobinki@ohnopublishing.net

Add DISTREN_REQUEST_PING handler to distrend and fix one of many memory leaks.

2 files changed with 21 insertions and 0 deletions:

src/server/distrend.c

src/server/listen.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -86,12 +86,13 @@ int distrend_config_free(struct distrend @@
 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);
 int distrend_handle_ping(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);
 int import_general_info(struct general_info *general_info);
 int update_xml_joblist(struct general_info *geninfo);
@@ @@ -172,12 +173,13 @@ int main(int argc, char *argv[]) @@
 	  fprintf(stderr, "Error listening on port %d\n", general_info.config->listen_ports[counter]);
 	  return 1;
+	}
+    }
   distrend_listen_handler_add(general_info.config->listens, DISTREN_REQUEST_VERSION, &distrend_handle_version);
   distrend_listen_handler_add(general_info.config->listens, DISTREN_REQUEST_PING, &distrend_handle_ping);
   int slaveKey = 0; // Remotio should set me on a per-slave basis
   /* Main Loop */
   general_info.config->die = 0;
   while(!general_info.config->die)
+    {
@@ @@ -267,12 +269,30 @@ int distrend_handle_version(struct gener @@
       distrend_send_disconnect(geninfo->config->listens, client, tmp_str);
+    }
   return 0;
+}
 int distrend_handle_ping(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data)
+{
   struct distren_request *pong_req;
   if(req_len > 32)
     distrend_send_disconnect(geninfo->config->listens, client, "You have tried to send a PING packet with a length longer than 32 bytes.");
   /**
       respond to the client using the data he sent in his PONG
       command.
    */
   distren_request_new(&pong_req, req_len, DISTREN_REQUEST_PONG);
   distrend_client_write_request(geninfo->config->listens, client, pong_req, req_data);
   distren_request_free(pong_req);
   return 0;
+}
 /**
    Performs command stored in a client's request. @TODO: Fill stub
 */
 int distrend_do()
+{
   return 0;

src/server/listen.c

➞

Show inline comments

@@ @@ -281,12 +281,13 @@ int distrend_handleread(struct distrend_ @@
       packet->len -= client->expectlen;
       client->inlen -= client->expectlen;
       client->expectlen = 0;
       distrend_dispatch_request(listens, client, req, reqdata);
       free(reqdata);
       distren_request_free(req);
+    }
   return 0;
+}
 struct distrend_accept_client_proc_data

0 comments (0 inline, 0 general)