epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

merged changes from R3.13.1 patch branch

Browse Source
This commit is contained in:
Jeff Hill
1999-07-17 00:40:58 +00:00
parent 5b9a5604e6
commit 94ab686e4c
6 changed files with 1923 additions and 1968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3474
src/rsrv/camessage.c
View File

File diff suppressed because it is too large Load Diff

24
src/rsrv/camsgtask.c
View File

@@ -213,16 +213,9 @@ FAST int sock;
if(CASDEBUG>0){
char buf[64];
logMsg( "CAS: Recieved connection request\n",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
ipAddrToA (&client->addr, buf, sizeof(buf));
logMsg( "from addr %s\n",
(int) /* sic */ buf,
ipAddrToA (&client->addr, buf, sizeof(buf));
logMsg( "CAS: conn req from %s\n",
(int) /* sic */ buf,
NULL,
NULL,
NULL,
@@ -356,11 +349,18 @@ FAST int sock;
client->recv.cnt = 0ul;
}
}else{
char buf[64];
client->recv.cnt = 0ul;
/*
* disconnect on message alignment
* problems
* disconnect when there are severe message errors
*/
ipAddrToA (&client->addr, buf, sizeof(buf));
logMsg ("CAS: forcing disconnect from %s\n",
/* sic */ (int) buf, NULL, NULL,
NULL, NULL, NULL);
break;
}

2
src/rsrv/caserverio.c
View File

@@ -70,7 +70,7 @@ int lock_needed;
{
int status;
if(CASDEBUG>2){
if(CASDEBUG>2 && pclient->send.stk){
logMsg( "CAS: Sending a message of %d bytes\n",
pclient->send.stk,
NULL,

28
src/rsrv/caservertask.c
View File

@@ -67,6 +67,9 @@ static char *sccsId = "@(#) $Id$";
#include "task_params.h"
#include "envDefs.h"
#include "freeList.h"
#include "errlog.h"
#include "bsdSocketResource.h"
#include "server.h"
LOCAL int terminate_one_client(struct client *client);
@@ -477,8 +480,6 @@ void casr (unsigned level)
freeListItemsAvail (rsrvChanFreeList),
freeListItemsAvail (rsrvEventFreeList));
printf ("The next resource ID allocated will be %u\n", getNextRsrvResourceID());
if(pCaBucket){
printf( "The server's resource id conversion table:\n");
FASTLOCK(&clientQlock);
@@ -500,12 +501,14 @@ LOCAL void log_one_client(struct client *client, unsigned level)
{
int i;
struct channel_in_use *pciu;
struct sockaddr_in *psaddr;
char *pproto;
float send_delay;
float recv_delay;
unsigned long bytes_reserved;
char *state[] = {"up", "down"};
char clientHostName[128];
ipAddrToA (&client->addr, clientHostName, sizeof(clientHostName));
if(client->proto == IPPROTO_UDP){
pproto = "UDP";
@@ -521,9 +524,10 @@ LOCAL void log_one_client(struct client *client, unsigned level)
recv_delay = delay_in_ticks(client->ticks_at_last_recv);
printf(
"Client Name=\"%s\", Client Host=\"%s\", V%d.%u, Channel Count=%d\n",
client->pUserName,
"%s(%s): User=\"%s\", V%d.%u, Channel Count=%d\n",
clientHostName,
client->pHostName,
client->pUserName,
CA_PROTOCOL_VERSION,
client->minor_version_number,
ellCount(&client->addrq));
@@ -537,18 +541,10 @@ LOCAL void log_one_client(struct client *client, unsigned level)
send_delay/sysClkRateGet(),
recv_delay/sysClkRateGet());
printf(
"\tUnprocessed request bytes=%lu, Undelivered response bytes=%lu\n",
"\tUnprocessed request bytes=%lu, Undelivered response bytes=%lu, State=%s\n",
client->send.stk,
client->recv.cnt - client->recv.stk);
psaddr = &client->addr;
printf(
"\tRemote Address %lu.%lu.%lu.%lu Remote Port %d State=%s\n",
(psaddr->sin_addr.s_addr & 0xff000000) >> 24,
(psaddr->sin_addr.s_addr & 0x00ff0000) >> 16,
(psaddr->sin_addr.s_addr & 0x0000ff00) >> 8,
(psaddr->sin_addr.s_addr & 0x000000ff),
psaddr->sin_port,
state[client->disconnect?1:0]);
client->recv.cnt - client->recv.stk,
state[client->disconnect?1:0]);
}
if (level>=2u) {

359
src/rsrv/cast_server.c
View File

@@ -102,8 +102,8 @@ int cast_server(void)
int count=0;
struct sockaddr_in new_recv_addr;
int recv_addr_size;
unsigned nchars;
unsigned short port;
int nchars;
taskwdInsert((int)taskIdCurrent,NULL,NULL);
@@ -111,30 +111,19 @@ int cast_server(void)
recv_addr_size = sizeof(new_recv_addr);
if( IOC_cast_sock!=0 && IOC_cast_sock!=ERROR )
if( (status = close(IOC_cast_sock)) == ERROR )
logMsg("CAS: Unable to close master cast socket\n",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
if( IOC_cast_sock!=0 && IOC_cast_sock!=ERROR ) {
if( (status = close(IOC_cast_sock)) == ERROR ) {
epicsPrintf ("CAS: Unable to close master cast socket\n");
}
}
/*
* Open the socket.
* Use ARPA Internet address format and datagram socket.
* Format described in <sys/socket.h>.
*/
*/
if((IOC_cast_sock = socket (AF_INET, SOCK_DGRAM, 0)) == ERROR){
logMsg("CAS: casts socket creation error\n",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
epicsPrintf ("CAS: casts socket creation error\n");
taskSuspend(taskIdSelf());
}
@@ -158,182 +147,153 @@ int cast_server(void)
status = setsockopt (IOC_cast_sock, SOL_SOCKET,
SO_RCVBUF, (char *)&size, sizeof(size));
if (status<0) {
logMsg("CAS: unable to set cast socket size\n",
NULL, NULL, NULL, NULL, NULL, NULL);
epicsPrintf ("CAS: unable to set cast socket size\n");
}
}
#endif
/* Zero the sock_addr structure */
bfill((char *)&sin, sizeof(sin), 0);
sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl(INADDR_ANY);
sin.sin_port = htons(port);
/* get server's Internet address */
if( bind(IOC_cast_sock, (struct sockaddr *)&sin, sizeof (sin)) == ERROR){
epicsPrintf ("CAS: cast bind error\n");
close (IOC_cast_sock);
taskSuspend(0);
}
/* tell clients we are on line again */
status = taskSpawn(
CA_ONLINE_NAME,
CA_ONLINE_PRI,
CA_ONLINE_OPT,
CA_ONLINE_STACK,
rsrv_online_notify_task,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
if(status==ERROR){
epicsPrintf ("CAS: couldnt start up online notify task because \"%s\"\n",
strerror(errnoGet()));
}
/*
* setup new client structure but reuse old structure if
* possible
*
*/
while(TRUE){
prsrv_cast_client = create_udp_client(IOC_cast_sock);
if(prsrv_cast_client){
break;
}
taskDelay(sysClkRateGet()*60*5);
}
while (TRUE) {
status = recvfrom (
IOC_cast_sock,
prsrv_cast_client->recv.buf,
sizeof(prsrv_cast_client->recv.buf),
NULL,
(struct sockaddr *)&new_recv_addr,
&recv_addr_size);
if (status<0) {
epicsPrintf ("CAS: UDP recv error (errno=%d)\n",
errnoGet());
taskDelay (sysClkRateGet());
}
else {
prsrv_cast_client->recv.cnt = (unsigned long) status;
prsrv_cast_client->recv.stk = 0ul;
prsrv_cast_client->ticks_at_last_recv = tickGet();
/* Zero the sock_addr structure */
bfill((char *)&sin, sizeof(sin), 0);
sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl(INADDR_ANY);
sin.sin_port = htons(port);
/* get server's Internet address */
if( bind(IOC_cast_sock, (struct sockaddr *)&sin, sizeof (sin)) == ERROR){
logMsg("CAS: cast bind error\n",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
close (IOC_cast_sock);
taskSuspend(0);
}
/*
* If we are talking to a new client flush to the old one
* in case we are holding UDP messages waiting to
* see if the next message is for this same client.
*/
if (prsrv_cast_client->send.stk) {
status = bcmp(
(char *)&prsrv_cast_client->addr,
(char *)&new_recv_addr,
recv_addr_size);
if(status){
/*
* if the address is different
*/
cas_send_msg(prsrv_cast_client, TRUE);
prsrv_cast_client->addr = new_recv_addr;
}
}
else {
prsrv_cast_client->addr = new_recv_addr;
}
/* tell clients we are on line again */
status = taskSpawn(
CA_ONLINE_NAME,
CA_ONLINE_PRI,
CA_ONLINE_OPT,
CA_ONLINE_STACK,
rsrv_online_notify_task,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
if(status==ERROR){
logMsg("CAS: couldnt start up online notify task because \"%s\"\n",
(int) /* sic */ strerror(errnoGet()),
NULL,
NULL,
NULL,
NULL,
NULL);
}
if(CASDEBUG>1){
char buf[40];
ipAddrToA (&prsrv_cast_client->addr, buf, sizeof(buf));
epicsPrintf ("CAS: cast server msg of %d bytes from addr %s\n",
prsrv_cast_client->recv.cnt, buf);
}
if(CASDEBUG>2)
count = ellCount(&prsrv_cast_client->addrq);
/*
* setup new client structure but reuse old structure if
* possible
*
*/
while(TRUE){
prsrv_cast_client = create_udp_client(IOC_cast_sock);
if(prsrv_cast_client){
break;
}
taskDelay(sysClkRateGet()*60*5);
}
status = camessage(
prsrv_cast_client,&prsrv_cast_client->recv);
if(status == OK){
if(prsrv_cast_client->recv.cnt !=
prsrv_cast_client->recv.stk){
char buf[40];
ipAddrToA (&prsrv_cast_client->addr, buf, sizeof(buf));
epicsPrintf ("CAS: partial (damaged?) UDP msg of %d bytes from %s ?\n",
prsrv_cast_client->recv.cnt-prsrv_cast_client->recv.stk, buf);
}
}
else {
char buf[40];
ipAddrToA (&prsrv_cast_client->addr, buf, sizeof(buf));
while(TRUE){
epicsPrintf ("CAS: invalid (damaged?) UDP request from %s ?\n", buf);
}
status = recvfrom(
IOC_cast_sock,
prsrv_cast_client->recv.buf,
sizeof(prsrv_cast_client->recv.buf),
NULL,
(struct sockaddr *)&new_recv_addr,
&recv_addr_size);
if(status<0){
logMsg("CAS: UDP recv error (errno=%d)\n",
errnoGet(),
NULL,
NULL,
NULL,
NULL,
NULL);
taskDelay(sysClkRateGet());
continue;
}
prsrv_cast_client->recv.cnt = (unsigned long) status;
prsrv_cast_client->recv.stk = 0ul;
prsrv_cast_client->ticks_at_last_recv = tickGet();
if(CASDEBUG>2){
if(ellCount(&prsrv_cast_client->addrq)){
epicsPrintf ("CAS: Fnd %d name matches (%d tot)\n",
ellCount(&prsrv_cast_client->addrq)-count,
ellCount(&prsrv_cast_client->addrq));
}
}
}
/*
* If we are talking to a new client flush the old one
* in case it is holding UDP messages waiting to
* see if the next message is for this same client.
* allow messages to batch up if more are comming
*/
status = bcmp(
(char *)&prsrv_cast_client->addr,
(char *)&new_recv_addr,
recv_addr_size);
if(status){
/*
* if the address is different
*/
cas_send_msg(prsrv_cast_client, TRUE);
prsrv_cast_client->addr = new_recv_addr;
}
if(CASDEBUG>1){
char buf[40];
logMsg( "CAS: cast server msg of %d bytes\n",
prsrv_cast_client->recv.cnt,
NULL,
NULL,
NULL,
NULL,
NULL);
ipAddrToA (&prsrv_cast_client->addr, buf, sizeof(buf));
logMsg( "CAS: from addr %s \n",
(int)buf,
NULL,
NULL,
NULL,
NULL,
NULL);
}
if(CASDEBUG>2)
count = ellCount(&prsrv_cast_client->addrq);
status = camessage(
prsrv_cast_client,
&prsrv_cast_client->recv);
if(status == OK){
if(prsrv_cast_client->recv.cnt !=
prsrv_cast_client->recv.stk){
logMsg( "CAS: partial UDP msg of %d bytes ?\n",
prsrv_cast_client->recv.cnt-
prsrv_cast_client->recv.stk,
NULL,
NULL,
NULL,
NULL,
NULL);
}
}
if(CASDEBUG>2){
if(ellCount(&prsrv_cast_client->addrq)){
logMsg( "CAS: Fnd %d name matches (%d tot)\n",
ellCount(&prsrv_cast_client->addrq)
-count,
ellCount(&prsrv_cast_client->addrq),
NULL,
NULL,
NULL,
NULL);
}
}
/*
* allow message to batch up if more are comming
*/
status = ioctl(IOC_cast_sock, FIONREAD, (int) &nchars);
status = ioctl(IOC_cast_sock, FIONREAD, /* sic */(int) &nchars);
if(status == ERROR){
taskSuspend(0);
taskSuspend(0);
}
if(nchars == 0){
cas_send_msg(prsrv_cast_client, TRUE);
clean_addrq();
}
if(nchars == 0){
cas_send_msg(prsrv_cast_client, TRUE);
clean_addrq();
}
}
}
@@ -392,13 +352,8 @@ LOCAL void clean_addrq()
# ifdef DEBUG
if(ndelete){
logMsg( "CAS: %d CA channels have expired after %d sec\n",
ndelete,
maxdelay / sysClkRateGet(),
NULL,
NULL,
NULL,
NULL);
epicsPrintf ("CAS: %d CA channels have expired after %d sec\n",
ndelete, maxdelay / sysClkRateGet());
}
# endif
@@ -416,24 +371,12 @@ struct client *create_udp_client(unsigned sock)
client = freeListMalloc(rsrvClientFreeList);
if(!client){
logMsg("CAS: no spae in pool for a new client\n",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
epicsPrintf ("CAS: no space in pool for a new client\n");
return NULL;
}
if(CASDEBUG>2)
logMsg( "CAS: Creating new udp client\n",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
epicsPrintf ("CAS: Creating new udp client\n");
/*
* The following inits to zero done instead of a bfill since the send
@@ -516,13 +459,7 @@ unsigned sock
int addrSize;
if(CASDEBUG>2){
logMsg("CAS: converting udp client to tcp\n",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
epicsPrintf ("CAS: converting udp client to tcp\n");
}
client->proto = IPPROTO_TCP;
@@ -537,13 +474,7 @@ unsigned sock
(struct sockaddr *)&client->addr,
&addrSize);
if(status == ERROR){
logMsg("CAS: peer address fetch failed\n",
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
epicsPrintf ("CAS: peer address fetch failed\n");
return ERROR;
}

4
src/rsrv/online_notify.c
View File

@@ -89,10 +89,10 @@ int rsrv_online_notify_task()
&maxPeriod);
if (longStatus || maxPeriod<=0.0) {
maxPeriod = 15.0;
ca_printf (
epicsPrintf (
"EPICS \"%s\" float fetch failed\n",
EPICS_CA_BEACON_PERIOD.name);
ca_printf (
epicsPrintf (
"Setting \"%s\" = %f\n",
EPICS_CA_BEACON_PERIOD.name,
maxPeriod);