add mr_proxy()

[moira.git] / lib / mr_ops.c

diff --git a/lib/mr_ops.c b/lib/mr_ops.c
index 015d5449898df67ff544ca52113ba5cc591fe2b1..1d7f6c41ea3e0d3383b027c9f17d0f23190a45e1 100644 (file)
--- a/lib/mr_ops.c
+++ b/lib/mr_ops.c
@@ -24,20 +24,16 @@ RCSID("$Header$");
 int mr_do_update(void)
 {
   int status;
-  mr_params param_st;
-  struct mr_params *params = NULL;
-  struct mr_params *reply = NULL;
+  mr_params params, reply;
 
   CHECK_CONNECTED;
-  params = &param_st;
-  params->mr_version_no = sending_version_no;
-  params->mr_procno = MR_DO_UPDATE;
-  params->mr_argc = 0;
-  params->mr_argl = NULL;
-  params->mr_argv = NULL;
+  params.u.mr_procno = MR_DO_UPDATE;
+  params.mr_argc = 0;
+  params.mr_argl = NULL;
+  params.mr_argv = NULL;
 
-  if ((status = mr_do_call(params, &reply)) == 0)
-    status = reply->mr_status;
+  if ((status = mr_do_call(&params, &reply)) == MR_SUCCESS)
+    status = reply.u.mr_status;
 
   mr_destroy_reply(reply);
 
@@ -52,55 +48,41 @@ int mr_do_update(void)
 int mr_motd(char **motd)
 {
   int status;
-  mr_params param_st;
-  struct mr_params *params = NULL;
-  struct mr_params *reply = NULL;
+  mr_params params, reply;
   static char *buffer = NULL;
 
   *motd = NULL;
   CHECK_CONNECTED;
-  params = &param_st;
-  params->mr_version_no = sending_version_no;
-  params->mr_procno = MR_MOTD;
-  params->mr_argc = 0;
-  params->mr_argl = NULL;
-  params->mr_argv = NULL;
-
-  if ((status = mr_do_call(params, &reply)))
+  params.u.mr_procno = MR_MOTD;
+  params.mr_argc = 0;
+  params.mr_argl = NULL;
+  params.mr_argv = NULL;
+
+  if ((status = mr_do_call(&params, &reply)))
     goto punt;
 
-  while ((status = reply->mr_status) == MR_MORE_DATA)
+  while ((status = reply.u.mr_status) == MR_MORE_DATA)
     {
-      if (reply->mr_argc > 0)
+      if (reply.mr_argc > 0)
        {
-         buffer = realloc(buffer, reply->mr_argl[0] + 1);
+         buffer = realloc(buffer, reply.mr_argl[0] + 1);
          if (!buffer)
            {
              mr_disconnect();
              return ENOMEM;
            }
-         strcpy(buffer, reply->mr_argv[0]);
+         strcpy(buffer, reply.mr_argv[0]);
          *motd = buffer;
        }
       mr_destroy_reply(reply);
-      reply = NULL;
-
-      initialize_operation(_mr_recv_op, mr_start_recv, &reply, NULL);
-      queue_operation(_mr_conn, CON_INPUT, _mr_recv_op);
-
-      complete_operation(_mr_recv_op);
-      if (OP_STATUS(_mr_recv_op) != OP_COMPLETE)
+      if (mr_receive(_mr_conn, &reply) != MR_SUCCESS)
        {
          mr_disconnect();
-         status = MR_ABORTED;
-         return status;
+         return MR_ABORTED;
        }
     }
 punt:
   mr_destroy_reply(reply);
-  /* for backwards compatability */
-  if (status == MR_UNKNOWN_PROC)
-    return 0;
-  else
-    return status;
+
+  return status;
 }