diff --git a/src/ca/access.c b/src/ca/access.c
index 9fd1e3703..04ead48b8 100644
--- a/src/ca/access.c
+++ b/src/ca/access.c
@@ -99,6 +99,9 @@
 /************************************************************************/
 /*
  * $Log$
+ * Revision 1.107.2.2  1999/09/02 21:16:40  jhill
+ * fixed missing paramter to checkConnWatchDogs() func
+ *
  * Revision 1.107.2.1  1999/07/15 20:23:57  jhill
  * fixed bug where client disconnects while waiting to send TCP
  *
@@ -1218,7 +1221,7 @@ int	reply_type
 
 	mptr->m_cmmd = htons (CA_PROTO_SEARCH);
 	mptr->m_available = chix->cid;
-	mptr->m_type = reply_type;
+	mptr->m_dataType = reply_type;
 	mptr->m_count = htons (CA_MINOR_VERSION);
 	mptr->m_cid = chix->cid;
 
@@ -1549,7 +1552,7 @@ LOCAL int issue_get_callback(evid monix, ca_uint16_t cmmd)
 	
 	/* msg header only on db read notify req	 */
 	hdr.m_cmmd = htons (cmmd);
-	hdr.m_type = htons ((ca_uint16_t)monix->type);
+	hdr.m_dataType = htons ((ca_uint16_t)monix->type);
 	hdr.m_count = htons (count);
 	hdr.m_available = monix->id;
 	hdr.m_postsize = 0;
@@ -1977,7 +1980,7 @@ const void	*pvalue
 #	endif /*CONVERSION_REQUIRED*/
 
 	hdr.m_cmmd = htons(cmd);
-	hdr.m_type = htons((ca_uint16_t)type);
+	hdr.m_dataType = htons((ca_uint16_t)type);
 	hdr.m_count = htons((ca_uint16_t)count);
 	hdr.m_cid = chix->id.sid;
 	hdr.m_available = id;
@@ -2327,7 +2330,7 @@ int ca_request_event(evid monix)
 	/* msg header	 */
 	msg.m_header.m_cmmd = htons(CA_PROTO_EVENT_ADD);
 	msg.m_header.m_available = monix->id;
-	msg.m_header.m_type = htons((ca_uint16_t)monix->type);
+	msg.m_header.m_dataType = htons((ca_uint16_t)monix->type);
 	msg.m_header.m_count = htons(count);
 	msg.m_header.m_cid = chix->id.sid;
 	msg.m_header.m_postsize = sizeof(msg.m_info);
@@ -2568,7 +2571,7 @@ int epicsShareAPI ca_clear_event (evid monix)
 		/* msg header	 */
 		hdr.m_cmmd = htons(CA_PROTO_EVENT_CANCEL);
 		hdr.m_available = pMon->id;
-		hdr.m_type = htons(chix->privType);
+		hdr.m_dataType = htons(chix->privType);
 		hdr.m_count = htons(chix->privCount);
 		hdr.m_cid = chix->id.sid;
 		hdr.m_postsize = 0;
@@ -2721,7 +2724,7 @@ int epicsShareAPI ca_clear_channel (chid pChan)
 	hdr.m_cmmd = htons(CA_PROTO_CLEAR_CHANNEL);
 	hdr.m_available = pChan->cid;
 	hdr.m_cid = pChan->id.sid;
-	hdr.m_type = htons(0);
+	hdr.m_dataType = htons(0);
 	hdr.m_count = htons(0);
 	hdr.m_postsize = 0;
 
@@ -3279,7 +3282,7 @@ int echo_request(struct ioc_in_use *piiu, ca_time *pCurrentTime)
 	int 		status;
 
 	hdr.m_cmmd = htons(CA_PROTO_ECHO);
-	hdr.m_type = htons(0);
+	hdr.m_dataType = htons(0);
 	hdr.m_count = htons(0);
 	hdr.m_cid = htons(0);
 	hdr.m_available = htons(0);
@@ -3313,7 +3316,7 @@ void noop_msg(struct ioc_in_use *piiu)
 	int 	status;
 
 	hdr.m_cmmd = htons(CA_PROTO_NOOP);
-	hdr.m_type = htons(0);
+	hdr.m_dataType = htons(0);
 	hdr.m_count = htons(0);
 	hdr.m_cid = htons(0);
 	hdr.m_available = htons(0);
diff --git a/src/ca/acctst.c b/src/ca/acctst.c
index e0f7fcea2..effbfe394 100644
--- a/src/ca/acctst.c
+++ b/src/ca/acctst.c
@@ -7,6 +7,9 @@ static char *sccsId = "@(#) $Id$";
 
 /*
  * $Log$
+ * Revision 1.56  1998/10/27 00:47:28  jhill
+ * fixed warnings
+ *
  * Revision 1.55  1998/09/24 21:11:38  jhill
  * verify that conn is dropped when channel count goes to zero
  *
@@ -1245,8 +1248,6 @@ void test_sync_groups(chid chix)
 	printf("done\n");
 }
 
-
-
 /*
  * multiple_sg_requests()
  */
diff --git a/src/ca/caProto.h b/src/ca/caProto.h
index 569e9ea40..3220256f6 100644
--- a/src/ca/caProto.h
+++ b/src/ca/caProto.h
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.5  1998/02/05 22:04:08  jhill
+ * added ETHERNET_MAX_UDP
+ *
  * Revision 1.4  1997/06/13 09:14:11  jhill
  * connect/search proto changes
  *
@@ -74,6 +77,9 @@
  *
  *	.10 050594 joh	New command added for CA V4.3 - wakeup the server
  * $Log$
+ * Revision 1.5  1998/02/05 22:04:08  jhill
+ * added ETHERNET_MAX_UDP
+ *
  * Revision 1.4  1997/06/13 09:14:11  jhill
  * connect/search proto changes
  *
@@ -232,7 +238,7 @@ typedef ca_uint32_t	caResId;
 typedef struct	ca_hdr {
 	ca_uint16_t	m_cmmd;		/* operation to be performed */
 	ca_uint16_t	m_postsize;	/* size of message extension */	
-	ca_uint16_t	m_type;		/* operation data type */ 
+	ca_uint16_t	m_dataType;		/* operation data type */ 
 	ca_uint16_t	m_count;	/* operation data count */
 	ca_uint32_t	m_cid;		/* channel identifier */
 	ca_uint32_t	m_available;	/* undefined message location for use
diff --git a/src/ca/repeater.c b/src/ca/repeater.c
index e17a8127b..ea0aa3e9f 100644
--- a/src/ca/repeater.c
+++ b/src/ca/repeater.c
@@ -38,6 +38,8 @@
  *	to all CA client processes that have subscribed.
  *
  *
+<<<<<<< repeater.c
+=======
  * 	Modification Log:
  * 	-----------------
  *	.01 060691 joh	Took out 4 byte count at message begin to 
@@ -57,6 +59,9 @@
  *			datagram socket (and watching for ECONNREFUSED)
  *
  * $Log$
+ * Revision 1.47  1998/09/29 20:50:37  jhill
+ * more robust in situations wherelocal IP cant be determined
+ *
  * Revision 1.46  1998/09/24 21:22:54  jhill
  * conn.c
  *
@@ -92,15 +97,7 @@
  *
  * Revision 1.32.6.1  1996/07/12 00:39:59  jhill
  * fixed client disconnect problem under solaris
- *
- * Revision 1.35  1996/07/10 23:30:11  jhill
- * fixed GNU warnings
- *
- * Revision 1.34  1996/06/19 17:59:24  jhill
- * many 3.13 beta changes
- *
- * Revision 1.33  1995/11/29  19:19:05  jhill
- * Added $log$
+>>>>>>> 1.50
  *
  */
 
@@ -155,12 +152,8 @@ LOCAL void verifyClients();
 LOCAL makeSocketReturn makeSocket (unsigned short port, int reuseAddr);
 LOCAL void fanOut(struct sockaddr_in *pFrom, const char *pMsg, unsigned msgSize);
 
-
 /*
- *
  *	ca_repeater()
- *
- *
  */
 void epicsShareAPI ca_repeater()
 {
diff --git a/src/ca/service.c b/src/ca/service.c
index 72ff73d28..46c350b84 100644
--- a/src/ca/service.c
+++ b/src/ca/service.c
@@ -147,13 +147,13 @@ unsigned long		blockSize
 			piiu->curMsg.m_postsize = 
 				ntohs(piiu->curMsg.m_postsize);
 			piiu->curMsg.m_cmmd = ntohs(piiu->curMsg.m_cmmd);
-			piiu->curMsg.m_type = ntohs(piiu->curMsg.m_type);
+			piiu->curMsg.m_dataType = ntohs(piiu->curMsg.m_dataType);
 			piiu->curMsg.m_count = ntohs(piiu->curMsg.m_count);
 #if 0
 			ca_printf("%s Cmd=%3d Type=%3d Count=%4d Size=%4d",
 				piiu->host_name_str,
 				piiu->curMsg.m_cmmd,
-				piiu->curMsg.m_type,
+				piiu->curMsg.m_dataType,
 				piiu->curMsg.m_count,
 				piiu->curMsg.m_postsize);
 			ca_printf(" Avail=%8x Cid=%6d\n",
@@ -341,8 +341,8 @@ const struct sockaddr_in  	*pnet_addr
 			 *
 			 */
 #			ifdef CONVERSION_REQUIRED 
-			if (piiu->curMsg.m_type<NELEMENTS(cac_dbr_cvrt)) {
-				(*cac_dbr_cvrt[piiu->curMsg.m_type])(
+			if (piiu->curMsg.m_dataType<NELEMENTS(cac_dbr_cvrt)) {
+				(*cac_dbr_cvrt[piiu->curMsg.m_dataType])(
 				     piiu->pCurData, 
 				     piiu->pCurData, 
 				     FALSE,
@@ -355,7 +355,7 @@ const struct sockaddr_in  	*pnet_addr
 
 			args.usr = (void *) monix->usr_arg;
 			args.chid = monix->chan;
-			args.type = piiu->curMsg.m_type;
+			args.type = piiu->curMsg.m_dataType;
 			args.count = piiu->curMsg.m_count;
 			args.dbr = piiu->pCurData;
 			/*
@@ -420,8 +420,8 @@ const struct sockaddr_in  	*pnet_addr
 		 * format to host format
 		 */
 #		ifdef CONVERSION_REQUIRED 
-			if (piiu->curMsg.m_type<NELEMENTS(cac_dbr_cvrt)) {
-				 (*cac_dbr_cvrt[piiu->curMsg.m_type])(
+			if (piiu->curMsg.m_dataType<NELEMENTS(cac_dbr_cvrt)) {
+				 (*cac_dbr_cvrt[piiu->curMsg.m_dataType])(
 					   piiu->pCurData, 
 					   piiu->pCurData, 
 					   FALSE,
@@ -441,7 +441,7 @@ const struct sockaddr_in  	*pnet_addr
 		 */
 		args.usr = (void *) monix->usr_arg;
 		args.chid = monix->chan;
-		args.type = piiu->curMsg.m_type;
+		args.type = piiu->curMsg.m_dataType;
 		args.count = piiu->curMsg.m_count;
 		args.dbr = piiu->pCurData;
 		/*
@@ -489,15 +489,15 @@ const struct sockaddr_in  	*pnet_addr
 			 * convert the data buffer from net
 			 * format to host format
 			 */
-			if (piiu->curMsg.m_type <= (unsigned) LAST_BUFFER_TYPE) {
+			if (piiu->curMsg.m_dataType <= (unsigned) LAST_BUFFER_TYPE) {
 #				ifdef CONVERSION_REQUIRED 
-					(*cac_dbr_cvrt[piiu->curMsg.m_type])(
+					(*cac_dbr_cvrt[piiu->curMsg.m_dataType])(
 					     piiu->pCurData, 
 					     (void *) pIOBlock->usr_arg, 
 					     FALSE,
 					     piiu->curMsg.m_count);
 #				else
-					if (piiu->curMsg.m_type == DBR_STRING &&
+					if (piiu->curMsg.m_dataType == DBR_STRING &&
 					     piiu->curMsg.m_count == 1u) {
 					     strcpy ((char *)pIOBlock->usr_arg,
 							 piiu->pCurData);
@@ -507,7 +507,7 @@ const struct sockaddr_in  	*pnet_addr
 							 (char *)pIOBlock->usr_arg,
 							 piiu->pCurData,
 							 dbr_size_n (
-								   piiu->curMsg.m_type, 
+								   piiu->curMsg.m_dataType, 
 								   piiu->curMsg.m_count)
 							 );
 					}
@@ -635,7 +635,7 @@ const struct sockaddr_in  	*pnet_addr
 				(pSlowBucket, &piiu->curMsg.m_cid);
 
 		args.usr = (void *) ca_static->ca_exception_arg;
-		args.type = ntohs (req->m_type);	
+		args.type = ntohs (req->m_dataType);	
 		args.count = ntohs (req->m_count);
 		args.stat = ntohl (piiu->curMsg.m_available);
 		args.op = op;
@@ -677,7 +677,7 @@ const struct sockaddr_in  	*pnet_addr
 		break;
 	}
 	case CA_PROTO_CLAIM_CIU:
-		cac_reconnect_channel(piiu->curMsg.m_cid, piiu->curMsg.m_type, piiu->curMsg.m_count);
+		cac_reconnect_channel(piiu->curMsg.m_cid, piiu->curMsg.m_dataType, piiu->curMsg.m_count);
 		break;
 
 	case CA_PROTO_CLAIM_CIU_FAILED:
@@ -878,10 +878,10 @@ const struct sockaddr_in	*pnet_addr
 		else {
 			ina.sin_addr = pnet_addr->sin_addr;
 		}
-		ina.sin_port = htons (piiu->curMsg.m_type);
+		ina.sin_port = htons (piiu->curMsg.m_dataType);
 	}
 	else if (CA_V45 (CA_PROTOCOL_VERSION,minorVersion)) {
-		ina.sin_port = htons(piiu->curMsg.m_type);
+		ina.sin_port = htons(piiu->curMsg.m_dataType);
 		ina.sin_addr = pnet_addr->sin_addr;
 	}
 	else {
@@ -1014,7 +1014,7 @@ const struct sockaddr_in	*pnet_addr
 	chan->id.sid = piiu->curMsg.m_cid;
 
 	if (!CA_V42(CA_PROTOCOL_VERSION, minorVersion)) {
-		chan->privType  = piiu->curMsg.m_type;      
+		chan->privType  = piiu->curMsg.m_dataType;      
 		chan->privCount = piiu->curMsg.m_count;
 	}