* $Author$
* $Header$
*
- * Copyright (C) 1987 by the Massachusetts Institute of Technology
+ * Copyright (C) 1987, 1990 by the Massachusetts Institute of Technology
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
*
- * $Log$
- * Revision 1.1 1987-06-16 17:48:21 wesommer
- * Initial revision
- *
- * Revision 1.4 87/06/04 01:32:18 wesommer
- * Renamed gdb calls.
- *
- * Revision 1.3 87/06/01 03:33:54 wesommer
- * Added destroy_reply.
- *
- * Revision 1.2 87/05/31 22:03:37 wesommer
- * Fixed numerous bugs; still shaky.
- *
*/
#ifndef lint
static char *rcsid_sms_param_c = "$Header$";
-#endif lint
+#endif
-#include "sms_private.h"
+#include <mit-copyright.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include "mr_private.h"
+#include <string.h>
+#include <stdlib.h>
/*
* GDB operations to send and recieve RPC requests and replies.
* write of the next bunch of data.
*/
-sms_cont_send(op, hcon, arg)
+/*ARGSUSED*/
+mr_cont_send(op, hcon, arg)
OPERATION op;
HALF_CONNECTION hcon;
- struct sms_params *arg;
+ struct mr_params *arg;
{
op->result = OP_SUCCESS;
- free(arg->sms_flattened);
+ free(arg->mr_flattened);
+ arg->mr_flattened = NULL;
+
return OP_COMPLETE;
}
-sms_start_send(op, hcon, arg)
+mr_start_send(op, hcon, arg)
OPERATION op;
HALF_CONNECTION hcon;
- register struct sms_params *arg;
+ register struct mr_params *arg;
{
int i, len;
- unsigned int sms_size;
+ unsigned int mr_size;
int *argl;
char *buf, *bp;
* This should probably be split into several routines.
* It could also probably be made more efficient (punting most
* of the argument marshalling stuff) by doing I/O directly
- * from the strings. Anyone for a scatter/gather sms_send_data?
+ * from the strings. Anyone for a scatter/gather mr_send_data?
*
* that would look a lot like the uio stuff in the kernel.. hmm.
*/
* At least for now, each argument is a string, which is
* sent as a count of bytes followed by the bytes
* (including the trailing '\0'), padded
- * to a longword boundary.
+ * to a 32-bit boundary.
*/
- sms_size = 4 * sizeof(long);
+ mr_size = 4 * sizeof(int32);
- argl = (int *)malloc((unsigned)(sizeof(int) * arg->sms_argc));
+ argl = (int *)malloc((unsigned)(sizeof(int) * arg->mr_argc));
/*
* For each argument, figure out how much space is needed.
*/
- for (i = 0; i < arg->sms_argc; ++i) {
- if (arg->sms_argl)
- argl[i] = len = arg->sms_argl[i];
+ for (i = 0; i < arg->mr_argc; ++i) {
+ if (arg->mr_argl)
+ argl[i] = len = arg->mr_argl[i];
else
- argl[i] = len = strlen(arg->sms_argv[i]) + 1;
- sms_size += sizeof(long) + len;
- /* Round up to next longword boundary.. */
- sms_size = sizeof(long) * howmany(sms_size, sizeof(long));
+ argl[i] = len = strlen(arg->mr_argv[i]) + 1;
+ mr_size += sizeof(int32) + len;
+ /* Round up to next 32-bit boundary.. */
+ mr_size = sizeof(int32) * howmany(mr_size, sizeof(int32));
}
- arg->sms_flattened = buf = malloc(sms_size);
+ arg->mr_flattened = buf = malloc(mr_size);
- bzero(arg->sms_flattened, sms_size);
+ memset(arg->mr_flattened, 0, mr_size);
- arg->sms_size = sms_size;
+ arg->mr_size = mr_size;
- /*
- * This is gross. Any better suggestions, anyone?
- * It should work on the RT's, since malloc is guaranteed to
- * return a pointer which is aligned correctly for any data.
- */
-
- ((long *)buf)[0] = htonl(sms_size);
- ((long *)buf)[1] = htonl((u_int)SMS_VERSION_1);
- ((long *)buf)[2] = htonl(arg->sms_procno);
- ((long *)buf)[3] = htonl(arg->sms_argc);
+ ((int32 *)buf)[0] = htonl(mr_size);
+ ((int32 *)buf)[1] = htonl(arg->mr_version_no);
+ ((int32 *)buf)[2] = htonl(arg->mr_procno);
+ ((int32 *)buf)[3] = htonl(arg->mr_argc);
/*
* bp is a pointer into the point in the buffer to put
* the next argument.
*/
- bp = (char *)(((long *)buf) + 4);
+ bp = (char *)(((int32 *)buf) + 4);
- for (i = 0; i<arg->sms_argc; ++i) {
+ for (i = 0; i<arg->mr_argc; ++i) {
len = argl[i];
- *((long *)bp) = htonl(len);
- bp += sizeof(long);
- bcopy(arg->sms_argv[i], bp, len);
- bp += sizeof(long) * howmany(len, sizeof(long));
+ *((int32 *)bp) = htonl(len);
+ bp += sizeof(int32);
+ memcpy(bp, arg->mr_argv[i], len);
+ bp += sizeof(int32) * howmany(len, sizeof(int32));
}
- op->fcn.cont = sms_cont_send;
- arg->sms_size = sms_size;
+ op->fcn.cont = mr_cont_send;
+ arg->mr_size = mr_size;
free(argl);
- if (gdb_send_data(hcon, arg->sms_flattened, sms_size) == OP_COMPLETE)
- return sms_cont_send(op, hcon, arg);
+ if (gdb_send_data(hcon, arg->mr_flattened, mr_size) == OP_COMPLETE)
+ return mr_cont_send(op, hcon, arg);
else return OP_RUNNING;
}
-sms_cont_recv(op, hcon, argp)
+/*ARGSUSED*/
+mr_cont_recv(op, hcon, argp)
OPERATION op;
HALF_CONNECTION hcon;
- sms_params **argp;
+ mr_params **argp;
{
int done = FALSE;
char *cp;
int *ip;
int i;
- register sms_params *arg = *argp;
+ register mr_params *arg = *argp;
while (!done) {
- switch (arg->sms_state) {
+ switch (arg->mr_state) {
case S_RECV_START:
- arg->sms_state = S_RECV_DATA;
- if (gdb_receive_data(hcon, (caddr_t)&arg->sms_size,
- sizeof(long)) == OP_COMPLETE)
+ arg->mr_state = S_RECV_DATA;
+ if (gdb_receive_data(hcon, (caddr_t)&arg->mr_size,
+ sizeof(int32)) == OP_COMPLETE)
continue;
done = TRUE;
break;
case S_RECV_DATA:
fflush(stdout);
/* Should validate that length is reasonable */
- arg->sms_size = ntohl(arg->sms_size);
- arg->sms_flattened = malloc(arg->sms_size);
- arg->sms_state = S_DECODE_DATA;
- bcopy((caddr_t)&arg->sms_size, arg->sms_flattened, sizeof(long));
+ arg->mr_size = ntohl(arg->mr_size);
+ if (arg->mr_size > 65536) {
+ return OP_CANCELLED;
+ }
+ arg->mr_flattened = malloc(arg->mr_size);
+ arg->mr_state = S_DECODE_DATA;
+ memcpy(arg->mr_flattened, (caddr_t)&arg->mr_size, sizeof(int32));
if (gdb_receive_data(hcon,
- arg->sms_flattened + sizeof(long),
- arg->sms_size - sizeof(long))
+ arg->mr_flattened + sizeof(int32),
+ arg->mr_size - sizeof(int32))
== OP_COMPLETE)
continue;
done = TRUE;
break;
case S_DECODE_DATA:
- cp = arg->sms_flattened;
+ cp = arg->mr_flattened;
ip = (int *) cp;
/* we already got the overall length.. */
for(i=1; i <4; i++) ip[i] = ntohl(ip[i]);
- if (ip[1] != SMS_VERSION_1)
- arg->sms_status = SMS_VERSION_MISMATCH;
- else arg->sms_status = ip[2];
- arg->sms_argc = ip[3];
+ arg->mr_version_no = ip[1];
+ if (arg->mr_version_no != MR_VERSION_1 &&
+ arg->mr_version_no != MR_VERSION_2)
+ arg->mr_status = MR_VERSION_MISMATCH;
+ else arg->mr_status = ip[2];
+ arg->mr_argc = ip[3];
cp += 4 * sizeof(int);
- arg->sms_argv=(char **)malloc(arg->sms_argc *sizeof(char **));
- arg->sms_argl=(int *)malloc(arg->sms_argc *sizeof(int *));
+ arg->mr_argv=(char **)malloc(arg->mr_argc *sizeof(char **));
+ arg->mr_argl=(int *)malloc(arg->mr_argc *sizeof(int *));
- for (i = 0; i<arg->sms_argc; ++i) {
- int nlen = ntohl(* (int *) cp);
- cp += sizeof (long);
- arg->sms_argv[i] = (char *)malloc(nlen);
- bcopy(cp, arg->sms_argv[i], nlen);
- arg->sms_argl[i]=nlen;
- cp += sizeof(long) * howmany(nlen, sizeof(long));
+ for (i = 0; i<arg->mr_argc; ++i) {
+ u_short nlen = ntohl(* (int *) cp);
+ cp += sizeof (int32);
+ if (cp + nlen > arg->mr_flattened + arg->mr_size) {
+ free(arg->mr_flattened);
+ arg->mr_flattened = NULL;
+ return OP_CANCELLED;
+ }
+ arg->mr_argv[i] = (char *)malloc(nlen);
+ memcpy(arg->mr_argv[i], cp, nlen);
+ arg->mr_argl[i]=nlen;
+ cp += sizeof(int32) * howmany(nlen, sizeof(int32));
}
- free(arg->sms_flattened);
- arg->sms_flattened = NULL;
+ free(arg->mr_flattened);
+ arg->mr_flattened = NULL;
return OP_COMPLETE;
}
}
}
-sms_start_recv(op, hcon, argp)
+mr_start_recv(op, hcon, argp)
OPERATION op;
HALF_CONNECTION hcon;
- struct sms_params **argp;
+ struct mr_params **argp;
{
- register sms_params *arg = *argp;
+ register mr_params *arg = *argp;
if (!arg) {
- *argp = arg = (sms_params *)malloc(sizeof(sms_params));
- arg->sms_argl = NULL;
- arg->sms_argv = NULL;
- arg->sms_flattened = NULL;
+ *argp = arg = (mr_params *)malloc(sizeof(mr_params));
+ arg->mr_argl = NULL;
+ arg->mr_argv = NULL;
+ arg->mr_flattened = NULL;
}
- arg->sms_state = S_RECV_START;
- op->fcn.cont = sms_cont_recv;
- return sms_cont_recv(op, hcon, argp);
+ arg->mr_state = S_RECV_START;
+ op->fcn.cont = mr_cont_recv;
+ return mr_cont_recv(op, hcon, argp);
}
-sms_destroy_reply(reply)
- sms_params *reply;
+mr_destroy_reply(reply)
+ mr_params *reply;
{
int i;
if (reply) {
- if (reply->sms_argl)
- free(reply->sms_argl);
- reply->sms_argl = NULL;
- if (reply->sms_flattened)
- free(reply->sms_flattened);
- reply->sms_flattened = NULL;
- if (reply->sms_argv) {
- for (i=0; i<reply->sms_argc; i++) {
- if (reply->sms_argv[i])
- free (reply->sms_argv[i]);
- reply->sms_argv[i] = NULL;
+ if (reply->mr_argl)
+ free(reply->mr_argl);
+ reply->mr_argl = NULL;
+ if (reply->mr_flattened)
+ free(reply->mr_flattened);
+ reply->mr_flattened = NULL;
+ if (reply->mr_argv) {
+ for (i=0; i<reply->mr_argc; i++) {
+ if (reply->mr_argv[i])
+ free (reply->mr_argv[i]);
+ reply->mr_argv[i] = NULL;
}
- free(reply->sms_argv);
+ free(reply->mr_argv);
}
- reply->sms_argv = NULL;
+ reply->mr_argv = NULL;
free(reply);
}
}
-
-/*
- * Local Variables:
- * mode: c
- * c-indent-level: 4
- * c-continued-statement-offset: 4
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * End:
- */
andersk / moira.git / blobdiff