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

use aToIPAddr

Browse Source
This commit is contained in:
Jeff Hill
1998-06-16 02:08:03 +00:00
parent 1acfbc1f00
commit 6bd5b857e7
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/env/envSubr.c
Vendored
+10 -7
View File
@@ -85,6 +85,8 @@
#define epicsExportSharedSymbols
#include "errMdef.h"
#include "envDefs.h"
#include "epicsAssert.h"
#include "bsdSocketResource.h"
/*+/subr**********************************************************************
@@ -288,16 +290,17 @@ struct in_addr *pAddr /* O pointer to struct to receive inet addr */
char text[128];
char *ptext;
long status;
struct sockaddr_in sin;
ptext = envGetConfigParam(pParam, sizeof text, text);
if (ptext) {
status = inet_addr (text);
if (status != -1) {
pAddr->s_addr = status;
return 0;
}
(void)fprintf(stderr,"Unable to find an IP address in %s=%s\n",
pParam->name, text);
status = aToIPAddr (text, 0u, &sin);
if (status == 0) {
*pAddr = sin.sin_addr;
return 0;
}
(void)fprintf(stderr,"Unable to find an IP address or valid host name in %s=%s\n",
pParam->name, text);
}
return -1;
}
src/libCom/envSubr.c
+10 -7
View File
@@ -85,6 +85,8 @@
#define epicsExportSharedSymbols
#include "errMdef.h"
#include "envDefs.h"
#include "epicsAssert.h"
#include "bsdSocketResource.h"
/*+/subr**********************************************************************
@@ -288,16 +290,17 @@ struct in_addr *pAddr /* O pointer to struct to receive inet addr */
char text[128];
char *ptext;
long status;
struct sockaddr_in sin;
ptext = envGetConfigParam(pParam, sizeof text, text);
if (ptext) {
status = inet_addr (text);
if (status != -1) {
pAddr->s_addr = status;
return 0;
}
(void)fprintf(stderr,"Unable to find an IP address in %s=%s\n",
pParam->name, text);
status = aToIPAddr (text, 0u, &sin);
if (status == 0) {
*pAddr = sin.sin_addr;
return 0;
}
(void)fprintf(stderr,"Unable to find an IP address or valid host name in %s=%s\n",
pParam->name, text);
}
return -1;
}