From: hadaq <hadaq>
Date: Sat, 25 Feb 2012 22:41:39 +0000 (+0000)
Subject: update
X-Git-Tag: v6.0~59
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=1acec6f24d7cee42534117de0299b73e18c33174;p=trbnettools.git

update
---

diff --git a/trbnetd/server/rpcserver.c b/trbnetd/server/rpcserver.c
index a1e4e10..57a82be 100644
--- a/trbnetd/server/rpcserver.c
+++ b/trbnetd/server/rpcserver.c
@@ -19,274 +19,287 @@
 int
 _register_read_1 (register_read_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (register_read_1_svc(argp->arg1, argp->arg2, argp->arg3, result, rqstp));
+  return (register_read_1_svc(argp->arg1, argp->arg2, argp->arg3, result, rqstp));
 }
 
 int
 _registertime_read_1 (registertime_read_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (registertime_read_1_svc(argp->arg1, argp->arg2, argp->arg3, result, rqstp));
+  return (registertime_read_1_svc(argp->arg1, argp->arg2, argp->arg3, result, rqstp));
 }
 
 int
 _register_read_mem_1 (register_read_mem_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (register_read_mem_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
+  return (register_read_mem_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
 }
 
 int
 _registertime_read_mem_1 (registertime_read_mem_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (registertime_read_mem_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
+  return (registertime_read_mem_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
 }
 
 int
 _register_write_1 (register_write_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (register_write_1_svc(argp->arg1, argp->arg2, argp->arg3, result, rqstp));
+  return (register_write_1_svc(argp->arg1, argp->arg2, argp->arg3, result, rqstp));
 }
 
 int
 _register_write_mem_1 (register_write_mem_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (register_write_mem_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, result, rqstp));
+  return (register_write_mem_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, result, rqstp));
 }
 
 int
 _read_uid_1 (read_uid_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (read_uid_1_svc(argp->arg1, argp->arg2, result, rqstp));
+  return (read_uid_1_svc(argp->arg1, argp->arg2, result, rqstp));
 }
 
 int
 _set_address_1 (set_address_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (set_address_1_svc(argp->arg1, argp->arg2, argp->arg3, result, rqstp));
+  return (set_address_1_svc(argp->arg1, argp->arg2, argp->arg3, result, rqstp));
 }
 
 int
 _send_trigger_1 (send_trigger_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (send_trigger_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, result, rqstp));
+  return (send_trigger_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, result, rqstp));
 }
 
 int
 _send_trigger_rich_1 (send_trigger_rich_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (send_trigger_rich_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
+  return (send_trigger_rich_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
 }
 
 int
 _ipu_data_read_1 (ipu_data_read_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (ipu_data_read_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
+  return (ipu_data_read_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
 }
 
 int
 _fpga_register_read_1 (uint16_t  *argp, void *result, struct svc_req *rqstp)
 {
-	return (fpga_register_read_1_svc(*argp, result, rqstp));
+  return (fpga_register_read_1_svc(*argp, result, rqstp));
 }
 
 int
 _fpga_register_write_1 (fpga_register_write_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (fpga_register_write_1_svc(argp->arg1, argp->arg2, result, rqstp));
+  return (fpga_register_write_1_svc(argp->arg1, argp->arg2, result, rqstp));
 }
 
 int
 _trb_fifo_flush_1 (uint8_t  *argp, void *result, struct svc_req *rqstp)
 {
-	return (trb_fifo_flush_1_svc(*argp, result, rqstp));
+  return (trb_fifo_flush_1_svc(*argp, result, rqstp));
 }
 
 int
 _network_reset_1 (void  *argp, void *result, struct svc_req *rqstp)
 {
-	return (network_reset_1_svc(result, rqstp));
+  return (network_reset_1_svc(result, rqstp));
 }
 
 int
 _com_reset_1 (void  *argp, void *result, struct svc_req *rqstp)
 {
-	return (com_reset_1_svc(result, rqstp));
+  return (com_reset_1_svc(result, rqstp));
 }
 
 int
 _register_modify_1 (register_modify_1_argument *argp, void *result, struct svc_req *rqstp)
 {
-	return (register_modify_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
+  return (register_modify_1_svc(argp->arg1, argp->arg2, argp->arg3, argp->arg4, argp->arg5, result, rqstp));
 }
 
+int
+_nettrace_1 (nettrace_1_argument *argp, void *result, struct svc_req *rqstp)
+{
+  return (nettrace_1_svc(argp->arg1, argp->arg2, result, rqstp));
+}
+
+
 void
 trbnetrpcprog_1(struct svc_req *rqstp, register SVCXPRT *transp)
 {
-	union {
-		register_read_1_argument register_read_1_arg;
-		registertime_read_1_argument registertime_read_1_arg;
-		register_read_mem_1_argument register_read_mem_1_arg;
-		registertime_read_mem_1_argument registertime_read_mem_1_arg;
-		register_write_1_argument register_write_1_arg;
-		register_write_mem_1_argument register_write_mem_1_arg;
-		read_uid_1_argument read_uid_1_arg;
-		set_address_1_argument set_address_1_arg;
-		send_trigger_1_argument send_trigger_1_arg;
-		send_trigger_rich_1_argument send_trigger_rich_1_arg;
-		ipu_data_read_1_argument ipu_data_read_1_arg;
-		uint16_t fpga_register_read_1_arg;
-		fpga_register_write_1_argument fpga_register_write_1_arg;
-		uint8_t trb_fifo_flush_1_arg;
-		register_modify_1_argument register_modify_1_arg;
-	} argument;
-	union {
-		RetVal register_read_1_res;
-		RetVal registertime_read_1_res;
-		RetVal register_read_mem_1_res;
-		RetVal registertime_read_mem_1_res;
-		Status register_write_1_res;
-		Status register_write_mem_1_res;
-		RetVal read_uid_1_res;
-		Status set_address_1_res;
-		Status send_trigger_1_res;
-		Status send_trigger_rich_1_res;
-		RetVal ipu_data_read_1_res;
-		RetVal fpga_register_read_1_res;
-		Status fpga_register_write_1_res;
-		Status trb_fifo_flush_1_res;
-		Status network_reset_1_res;
-		Status com_reset_1_res;
-		Status register_modify_1_res;
-	} result;
-	bool_t retval;
-	xdrproc_t _xdr_argument, _xdr_result;
-	bool_t (*local)(char *, void *, struct svc_req *);
-
-	switch (rqstp->rq_proc) {
-	case NULLPROC:
-		(void) svc_sendreply (transp, (xdrproc_t) xdr_void, (char *)NULL);
-		return;
-
-	case REGISTER_READ:
-		_xdr_argument = (xdrproc_t) xdr_register_read_1_argument;
-		_xdr_result = (xdrproc_t) xdr_RetVal;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_register_read_1;
-		break;
-
-	case REGISTERTIME_READ:
-		_xdr_argument = (xdrproc_t) xdr_registertime_read_1_argument;
-		_xdr_result = (xdrproc_t) xdr_RetVal;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_registertime_read_1;
-		break;
-
-	case REGISTER_READ_MEM:
-		_xdr_argument = (xdrproc_t) xdr_register_read_mem_1_argument;
-		_xdr_result = (xdrproc_t) xdr_RetVal;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_register_read_mem_1;
-		break;
-
-	case REGISTERTIME_READ_MEM:
-		_xdr_argument = (xdrproc_t) xdr_registertime_read_mem_1_argument;
-		_xdr_result = (xdrproc_t) xdr_RetVal;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_registertime_read_mem_1;
-		break;
-
-	case REGISTER_WRITE:
-		_xdr_argument = (xdrproc_t) xdr_register_write_1_argument;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_register_write_1;
-		break;
-
-	case REGISTER_WRITE_MEM:
-		_xdr_argument = (xdrproc_t) xdr_register_write_mem_1_argument;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_register_write_mem_1;
-		break;
-
-	case READ_UID:
-		_xdr_argument = (xdrproc_t) xdr_read_uid_1_argument;
-		_xdr_result = (xdrproc_t) xdr_RetVal;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_read_uid_1;
-		break;
-
-	case SET_ADDRESS:
-		_xdr_argument = (xdrproc_t) xdr_set_address_1_argument;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_set_address_1;
-		break;
-
-	case SEND_TRIGGER:
-		_xdr_argument = (xdrproc_t) xdr_send_trigger_1_argument;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_send_trigger_1;
-		break;
-
-	case SEND_TRIGGER_RICH:
-		_xdr_argument = (xdrproc_t) xdr_send_trigger_rich_1_argument;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_send_trigger_rich_1;
-		break;
-
-	case IPU_DATA_READ:
-		_xdr_argument = (xdrproc_t) xdr_ipu_data_read_1_argument;
-		_xdr_result = (xdrproc_t) xdr_RetVal;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_ipu_data_read_1;
-		break;
-
-	case FPGA_REGISTER_READ:
-		_xdr_argument = (xdrproc_t) xdr_uint16_t;
-		_xdr_result = (xdrproc_t) xdr_RetVal;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_fpga_register_read_1;
-		break;
-
-	case FPGA_REGISTER_WRITE:
-		_xdr_argument = (xdrproc_t) xdr_fpga_register_write_1_argument;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_fpga_register_write_1;
-		break;
-
-	case TRB_FIFO_FLUSH:
-		_xdr_argument = (xdrproc_t) xdr_uint8_t;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_trb_fifo_flush_1;
-		break;
-
-	case NETWORK_RESET:
-		_xdr_argument = (xdrproc_t) xdr_void;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_network_reset_1;
-		break;
-
-	case COM_RESET:
-		_xdr_argument = (xdrproc_t) xdr_void;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_com_reset_1;
-		break;
-
-	case REGISTER_MODIFY:
-		_xdr_argument = (xdrproc_t) xdr_register_modify_1_argument;
-		_xdr_result = (xdrproc_t) xdr_Status;
-		local = (bool_t (*) (char *, void *,  struct svc_req *))_register_modify_1;
-		break;
-
-	default:
-		svcerr_noproc (transp);
-		return;
-	}
-	memset ((char *)&argument, 0, sizeof (argument));
-	if (!svc_getargs (transp, (xdrproc_t) _xdr_argument, (caddr_t) &argument)) {
-		svcerr_decode (transp);
-		return;
-	}
-	retval = (bool_t) (*local)((char *)&argument, (void *)&result, rqstp);
-	if (retval > 0 && !svc_sendreply(transp, (xdrproc_t) _xdr_result, (char *)&result)) {
-		svcerr_systemerr (transp);
-	}
-	if (!svc_freeargs (transp, (xdrproc_t) _xdr_argument, (caddr_t) &argument)) {
-		fprintf (stderr, "%s", "unable to free arguments");
-		exit (1);
-	}
-	if (!trbnetrpcprog_1_freeresult (transp, _xdr_result, (caddr_t) &result))
-		fprintf (stderr, "%s", "unable to free results");
-
-	return;
+  union {
+    register_read_1_argument register_read_1_arg;
+    registertime_read_1_argument registertime_read_1_arg;
+    register_read_mem_1_argument register_read_mem_1_arg;
+    registertime_read_mem_1_argument registertime_read_mem_1_arg;
+    register_write_1_argument register_write_1_arg;
+    register_write_mem_1_argument register_write_mem_1_arg;
+    read_uid_1_argument read_uid_1_arg;
+    set_address_1_argument set_address_1_arg;
+    send_trigger_1_argument send_trigger_1_arg;
+    send_trigger_rich_1_argument send_trigger_rich_1_arg;
+    ipu_data_read_1_argument ipu_data_read_1_arg;
+    uint16_t fpga_register_read_1_arg;
+    fpga_register_write_1_argument fpga_register_write_1_arg;
+    uint8_t trb_fifo_flush_1_arg;
+    register_modify_1_argument register_modify_1_arg;
+  } argument;
+  union {
+    RetVal register_read_1_res;
+    RetVal registertime_read_1_res;
+    RetVal register_read_mem_1_res;
+    RetVal registertime_read_mem_1_res;
+    Status register_write_1_res;
+    Status register_write_mem_1_res;
+    RetVal read_uid_1_res;
+    Status set_address_1_res;
+    Status send_trigger_1_res;
+    Status send_trigger_rich_1_res;
+    RetVal ipu_data_read_1_res;
+    RetVal fpga_register_read_1_res;
+    Status fpga_register_write_1_res;
+    Status trb_fifo_flush_1_res;
+    Status network_reset_1_res;
+    Status com_reset_1_res;
+    Status register_modify_1_res;
+  } result;
+  bool_t retval;
+  xdrproc_t _xdr_argument, _xdr_result;
+  bool_t (*local)(char *, void *, struct svc_req *);
+
+  switch (rqstp->rq_proc) {
+  case NULLPROC:
+    (void) svc_sendreply (transp, (xdrproc_t) xdr_void, (char *)NULL);
+    return;
+
+  case REGISTER_READ:
+    _xdr_argument = (xdrproc_t) xdr_register_read_1_argument;
+    _xdr_result = (xdrproc_t) xdr_RetVal;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_register_read_1;
+    break;
+
+  case REGISTERTIME_READ:
+    _xdr_argument = (xdrproc_t) xdr_registertime_read_1_argument;
+    _xdr_result = (xdrproc_t) xdr_RetVal;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_registertime_read_1;
+    break;
+
+  case REGISTER_READ_MEM:
+    _xdr_argument = (xdrproc_t) xdr_register_read_mem_1_argument;
+    _xdr_result = (xdrproc_t) xdr_RetVal;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_register_read_mem_1;
+    break;
+
+  case REGISTERTIME_READ_MEM:
+    _xdr_argument = (xdrproc_t) xdr_registertime_read_mem_1_argument;
+    _xdr_result = (xdrproc_t) xdr_RetVal;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_registertime_read_mem_1;
+    break;
+
+  case REGISTER_WRITE:
+    _xdr_argument = (xdrproc_t) xdr_register_write_1_argument;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_register_write_1;
+    break;
+
+  case REGISTER_WRITE_MEM:
+    _xdr_argument = (xdrproc_t) xdr_register_write_mem_1_argument;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_register_write_mem_1;
+    break;
+
+  case READ_UID:
+    _xdr_argument = (xdrproc_t) xdr_read_uid_1_argument;
+    _xdr_result = (xdrproc_t) xdr_RetVal;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_read_uid_1;
+    break;
+
+  case SET_ADDRESS:
+    _xdr_argument = (xdrproc_t) xdr_set_address_1_argument;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_set_address_1;
+    break;
+
+  case SEND_TRIGGER:
+    _xdr_argument = (xdrproc_t) xdr_send_trigger_1_argument;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_send_trigger_1;
+    break;
+
+  case SEND_TRIGGER_RICH:
+    _xdr_argument = (xdrproc_t) xdr_send_trigger_rich_1_argument;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_send_trigger_rich_1;
+    break;
+
+  case IPU_DATA_READ:
+    _xdr_argument = (xdrproc_t) xdr_ipu_data_read_1_argument;
+    _xdr_result = (xdrproc_t) xdr_RetVal;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_ipu_data_read_1;
+    break;
+
+  case FPGA_REGISTER_READ:
+    _xdr_argument = (xdrproc_t) xdr_uint16_t;
+    _xdr_result = (xdrproc_t) xdr_RetVal;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_fpga_register_read_1;
+    break;
+
+  case FPGA_REGISTER_WRITE:
+    _xdr_argument = (xdrproc_t) xdr_fpga_register_write_1_argument;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_fpga_register_write_1;
+    break;
+
+  case TRB_FIFO_FLUSH:
+    _xdr_argument = (xdrproc_t) xdr_uint8_t;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_trb_fifo_flush_1;
+    break;
+
+  case NETWORK_RESET:
+    _xdr_argument = (xdrproc_t) xdr_void;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_network_reset_1;
+    break;
+
+  case COM_RESET:
+    _xdr_argument = (xdrproc_t) xdr_void;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_com_reset_1;
+    break;
+
+  case REGISTER_MODIFY:
+    _xdr_argument = (xdrproc_t) xdr_register_modify_1_argument;
+    _xdr_result = (xdrproc_t) xdr_Status;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_register_modify_1;
+    break;
+  
+  case NETTRACE:
+    _xdr_argument = (xdrproc_t) xdr_nettrace_1_argument;
+    _xdr_result = (xdrproc_t) xdr_RetVal;
+    local = (bool_t (*) (char *, void *,  struct svc_req *))_nettrace_1;
+    break;  
+    
+  default:
+    svcerr_noproc (transp);
+    return;
+  }
+  memset ((char *)&argument, 0, sizeof (argument));
+  if (!svc_getargs (transp, (xdrproc_t) _xdr_argument, (caddr_t) &argument)) {
+    svcerr_decode (transp);
+    return;
+  }
+  retval = (bool_t) (*local)((char *)&argument, (void *)&result, rqstp);
+  if (retval > 0 && !svc_sendreply(transp, (xdrproc_t) _xdr_result, (char *)&result)) {
+    svcerr_systemerr (transp);
+  }
+  if (!svc_freeargs (transp, (xdrproc_t) _xdr_argument, (caddr_t) &argument)) {
+    fprintf (stderr, "%s", "unable to free arguments");
+    exit (1);
+  }
+  if (!trbnetrpcprog_1_freeresult (transp, _xdr_result, (caddr_t) &result))
+    fprintf (stderr, "%s", "unable to free results");
+
+  return;
 }