diff --git a/src/geoid.c b/src/geoid.c
index 62fa0c01a7723685019b05174d610803510941c7..791b5d845ce06ea5a0ae54dae5b23441f4e0b916 100644
--- a/src/geoid.c
+++ b/src/geoid.c
@@ -14,35 +14,12 @@
* opengeoid(),closegeoid()
*-----------------------------------------------------------------------------*/
#include "rtklib.h"
-#define RAF09_READ_BUFFER_SIZE 4096
-
-static const char rcsid[]="$Id: geoid.c,v 1.1 2008/07/17 21:48:06 ttaka Exp $";
static const double range[4]; /* embedded geoid area range {W,E,S,N} (deg) */
static const float geoid[361][181]; /* embedded geoid heights (m) (lon x lat) */
static FILE *fp_geoid=NULL; /* geoid file pointer */
static int model_geoid=GEOID_EMBEDDED; /* geoid model */
-typedef struct{
- int lonSize;
- int latSize;
- double minLon;
- double maxLon;
- double minLat;
- double maxLat;
- double stepLon;
- double stepLat;
- int sortOrder;
- int isCoordinatesPresent;
- int nvValPerNode;
- int isPrecisionCodePresent;
- int translationApplied;
- int isGridValid;
- char *name;
- double **grid;
-}raf09_grid_t;
-static raf09_grid_t raf09_grid;
-
/* bilinear interpolation ----------------------------------------------------*/
static double interpb(const double *y, double a, double b)
{
@@ -69,270 +46,6 @@ static double geoidh_emb(const double *pos)
y[3]=geoid[i2][j2];
return interpb(y,a,b);
}
-
-void free_raf09_grid() {
- if(raf09_grid.name != NULL) {
- free(raf09_grid.name);
- }
- if (raf09_grid.grid != NULL) {
- int i;
- for (i = 0; i < raf09_grid.lonSize; ++i) {
- free(raf09_grid.grid[i]);
- }
- free(raf09_grid.grid);
- }
- raf09_grid.latSize = 0;
- raf09_grid.lonSize = 0;
- raf09_grid.isGridValid = 0;
-}
-/*------------------------------------------------------------------------------
- * ign raf09 support
- */
-size_t raf09_getline(char **lineptr, size_t *n, FILE *stream)
-{
-#ifdef _HAVE_FGETLN_ /* fgetln is faster */
- char *ptr;
- size_t len;
- ptr = fgetln(stream, n);
- if (ptr == NULL) {
- return -1;
- }
-
- if (*lineptr != NULL) free(*lineptr); /*ensure that the pointer supplied is free*/
- /* Add one more space for '\0' */
- len = n[0] + 1;
- n[0] = len;
- /* Allocate a new buffer */
- *lineptr = malloc(len);
- /* Copy over the string */
- memcpy(*lineptr, ptr, len-1);
- /* Write the NULL character */
- (*lineptr)[len-1] = '\0';
- /* Return the length of the new buffer */
- return len;
-#else
-#define OPTIMISTIC_LINE_SIZE 80 /* because a standard text file is 80 chars wide */
- char *bufptr = NULL;
- char *p = bufptr;
- size_t size;
- int offset;
- int c;
-
- if ((lineptr == NULL) || (stream == NULL) || (n == NULL)) {
- return -1;
- }
-
- bufptr = *lineptr;
- size = *n;
-
- c = fgetc(stream);
- if (c == EOF) {
- return -1;
- }
- if (bufptr == NULL) {
- bufptr = (char *)malloc(OPTIMISTIC_LINE_SIZE); /* alocate an initial buffer */
- if (bufptr == NULL) {
- return -1;
- }
- size = OPTIMISTIC_LINE_SIZE;
- }
- p = bufptr;
- while(c != EOF) {
- offset = p - bufptr;
- if ((p - bufptr) > ((int)size - 1)) { /* there is not enough place in bufptr for storing another char so expand bufptr */
- size = size + OPTIMISTIC_LINE_SIZE;
- bufptr = (char *)realloc(bufptr, size);
- p = bufptr + offset; /* bufptr may have a new location, so be sure to relocate p to its new position */
- if (bufptr == NULL) {
- return -1;
- }
- }
- *p++ = c;
- if (c == '\n') {
- break;
- }
- c = fgetc(stream);
- }
-
- *p++ = '\0';
- *lineptr = bufptr;
- *n = size;
-
- return p - bufptr - 1; /*posix 2008 getline does not count termination char*/
-#endif
-}
-void get_raf09_grid(FILE *fp)
-{
- const char SPACE_CHAR = 0x20;
- const char NULL_CHAR = 0x0;
-
- char buffer[RAF09_READ_BUFFER_SIZE];
- int cFieldCounter;
- char *geoid_text = NULL;
- char *pGeoidText;
- char *pCurrentValue; /*Working pointer on current scanned value*/
- char *pFirstElement; /*working pointer on the first element*/
- char *pText; /*Pointer a the end of the line*/
- size_t read;
- size_t geoid_text_len=0;
- int it; /*iterator on longitude*/
- int nbElementsTotal = 0; /*number of different element in geoid line*/
- int nbElementsAltitude = 0; /*number of altitude element in geoid line*/
- int nbElLon,nbElLat,nbElPerNode;
- int i,j,kLon,lLat; /*i is for counting down from end to start of the line*/
- /*j is counting up (faster than subtracting), */
- /*kLon, lLat are indexes in grid grid[kLon][lLat]*/
-
- raf09_grid.latSize=0;
- raf09_grid.lonSize=0;
- raf09_grid.isGridValid=0;
- raf09_grid.grid = NULL;
- raf09_grid.name = NULL;
- if (fp != NULL) {
- if (feof(fp)==0) {
- /*read ign mnt header*/
- /*an IGN type 2 mnt geoid model file is composed of 2 lines:*/
- /* - first line is the header*/
- /* - second line is the geoid*/
- /* see http://geodesie.ign.fr/contenu/fichiers/documentation/grilles/notices/Grilles-MNT-TXT_Formats.pdf*/
- /* for explanation of format in french*/
- /*11 numeric fields + 1 string field*/
- /*the first 11 fields are separated by one space*/
- /*lines are ended with \r\n*/
- if (fgets(buffer,RAF09_READ_BUFFER_SIZE,fp) != NULL) {
- char *pBuffer = buffer;
- char *fields[12];
- fields[0]=pBuffer;
- cFieldCounter = 1;
- while(pBuffer&&(cFieldCounter<12))
- {
- if (*pBuffer==SPACE_CHAR) {
- *pBuffer = NULL_CHAR;
- fields[cFieldCounter]=pBuffer+1;
- cFieldCounter++;
- }
- pBuffer++;
- }
- if (cFieldCounter == 12) { /* seems OK */
-
- fields[11][strlen(fields[11])-2]=NULL_CHAR;
- raf09_grid.name = (char*)malloc( (strlen(fields[11])+1)*sizeof(*fields[11]));
- strcpy(raf09_grid.name,fields[11]);
- raf09_grid.minLon=atof(fields[0]);
- raf09_grid.maxLon=atof(fields[1]);
- raf09_grid.minLat=atof(fields[2]);
- raf09_grid.maxLat=atof(fields[3]);
- raf09_grid.stepLon=atof(fields[4]);
- raf09_grid.stepLat=atof(fields[5]);
- raf09_grid.sortOrder = atoi(fields[6]); /* if atoi failed (ie file is wrong) sortOrder = 0 so we will not parse */
- raf09_grid.isCoordinatesPresent = atoi(fields[7]);
- raf09_grid.nvValPerNode = atoi(fields[8]);
- raf09_grid.isPrecisionCodePresent = atoi(fields[9]);
- raf09_grid.translationApplied = atoi(fields[10]);
-
- nbElLon=floor((raf09_grid.maxLon-raf09_grid.minLon)/raf09_grid.stepLon)+1; /*do not forget +1 for extremities*/
- nbElLat=floor((raf09_grid.maxLat-raf09_grid.minLat)/raf09_grid.stepLat)+1;
-
- /*explanation of nbElPerNode:*/
- /* minimum 1 element (the altitude component)*/
- /* if coordinates are present for each node +2 elements*/
- /* if precision code is present +1 element*/
- /* maybe 0 if atoi and atof failed in parsing (strange file) so we will stop parsing */
- nbElPerNode=raf09_grid.nvValPerNode+raf09_grid.isPrecisionCodePresent+(raf09_grid.isCoordinatesPresent?2:0);
-
- raf09_grid.latSize=nbElLat;
- raf09_grid.lonSize=nbElLon;
-
- if ((nbElPerNode>0) && (raf09_grid.sortOrder==2)){
- read = raf09_getline(&geoid_text,&geoid_text_len,fp);
- if (read > 0) { /*be sure that we have something to parse*/
- pGeoidText = geoid_text; /*working pointer on the geoid line*/
- while(*pGeoidText){ /*during counting we split the geoid line*/
- if (*pGeoidText==SPACE_CHAR){
- *pGeoidText=NULL_CHAR;
- nbElementsTotal++;
- }
- pGeoidText++;
- }
- nbElementsAltitude = nbElementsTotal/nbElPerNode;
- if (nbElementsAltitude == (raf09_grid.latSize*raf09_grid.lonSize)){ /*Grid seems valid so we will do parsing*/
- /*so we need to allocate an in memory grid*/
- raf09_grid.grid = malloc(raf09_grid.lonSize*sizeof(double*));
- for(it=0;it<raf09_grid.lonSize;it++)
- raf09_grid.grid[it] = malloc(raf09_grid.latSize*sizeof(double));
- pFirstElement = geoid_text;
- pText = geoid_text+read; /*Pointer a the end of the line*/
- j=0;kLon=nbElLon-1;lLat=0; /*i is for counting down from end to start of the line*/
- /*j is counting up (faster than subtracting)*/
- /*kLon, lLat are indexes in grid grid[kLon][lLat]*/
- for (i=read;i>0;i--){
- if(!*pText && *(pText+1)){ /*only if pointer is on \0 and pointer+1 is on a real character*/
- if( (j+1)%nbElPerNode == 0) /*we keep only the altitude component*/
- {
- pCurrentValue = pText+1;
- raf09_grid.grid[kLon][lLat]=atof(pCurrentValue); /*placing it into the grid*/
- if(kLon==0){ /*we are going from SE to NW*/
- kLon=nbElLon-1;
- lLat++;
- }else{
- kLon--;
- }
- }
- j++;
- }
- pText--;
- }
- /*last value*/
- raf09_grid.grid[kLon][lLat]=atof(pFirstElement);
- /*wonderful now we have a double[lon][lat] grid*/
- raf09_grid.isGridValid = 1;
- trace(3,"get_raf09_grid: '%s' was parsed correctly\n",raf09_grid.name);
- }
- free(geoid_text);
- } /* if second line was correctly read */
- }else{ /*if sort order is not ==2*/
- trace(2,"sort order %d of IGN mnt geoid model is not yet supported\n",raf09_grid.sortOrder);
- }
- } /* test 12 fields */
- } /* test if fgets of first line succeed */
- }
- } else { /*if fopen failed*/
- trace(2,"Geoid model fopen failed\n");
- }
-
-}
-
-static double geoidh_raf09(const double *pos)
-{
- double a,b,y[4],posd[2];
- int lat1,lat2,lon1,lon2;
-
- if (raf09_grid.isGridValid == 0) {
- trace(2,"RAF09 grid is invalid get RAF09.mnt from http://geodesie.ign.fr/contenu/fichiers/documentation/grilles/metropole/RAF09.mnt");
- return 0.0;
- }
-
- posd[0]=pos[0];
- posd[1]=(pos[1]>180?pos[1]-360:pos[1]);
-
- if (posd[1]>raf09_grid.maxLon||
- posd[1]<raf09_grid.minLon||
- posd[0]>raf09_grid.maxLat||
- posd[0]<raf09_grid.minLat) {
- trace(2,"out of geoid model range: lat=%.3f lon=%.3f\n",pos[0],posd[1]);
- return 0.0;
- }
-
- a=(posd[0]-raf09_grid.minLat)/raf09_grid.stepLat;
- b=(posd[1]-raf09_grid.minLon)/raf09_grid.stepLon;
- lat1=(int)a; a-=lat1; lat2=lat1<raf09_grid.latSize-1?lat1+1:lat1;
- lon1=(int)b; b-=lon1; lon2=lon1<raf09_grid.lonSize-1?lon1+1:lon1;
- y[0]=raf09_grid.grid[lon1][lat1];
- y[1]=raf09_grid.grid[lon2][lat1];
- y[2]=raf09_grid.grid[lon1][lat2];
- y[3]=raf09_grid.grid[lon2][lat2];
- return interpb(y,a,b);
-}
/* get 2 byte signed integer from file ---------------------------------------*/
static short fget2b(FILE *fp, long off)
{
@@ -351,7 +64,7 @@ static double geoidh_egm96(const double *pos)
long i1,i2,j1,j2;
if (!fp_geoid) return 0.0;
-
+
a=(pos[1]-lon0)/dlon;
b=(pos[0]-lat0)/dlat;
i1=(long)a; a-=i1; i2=i1<nlon-1?i1+1:0;
@@ -379,9 +92,9 @@ static double geoidh_egm08(const double *pos, int model)
double a,b,y[4];
long i1,i2,j1,j2;
int nlon,nlat;
-
+
if (!fp_geoid) return 0.0;
-
+
if (model==GEOID_EGM2008_M25) { /* 2.5 x 2.5" grid */
dlon= 2.5/60.0;
dlat=-2.5/60.0;
@@ -490,8 +203,7 @@ extern int opengeoid(int model, const char *file)
return 1;
}
if (model!=GEOID_EGM96_M150 &&model!=GEOID_EGM2008_M25&&
- model!=GEOID_EGM2008_M10&&model!=GEOID_GSI2000_M15&&
- model!=GEOID_RAF09) {
+ model!=GEOID_EGM2008_M10&&model!=GEOID_GSI2000_M15) {
trace(2,"invalid geoid model: model=%d file=%s\n",model,file);
return 0;
}
@@ -499,9 +211,6 @@ extern int opengeoid(int model, const char *file)
trace(2,"geoid model file open error: model=%d file=%s\n",model,file);
return 0;
}
- if (model==GEOID_RAF09) {
- get_raf09_grid(fp_geoid);
- }
model_geoid=model;
return 1;
}
@@ -513,11 +222,8 @@ extern int opengeoid(int model, const char *file)
extern void closegeoid(void)
{
trace(3,"closegoid:\n");
-
+
if (fp_geoid) fclose(fp_geoid);
- if (model_geoid==GEOID_RAF09) {
- free_raf09_grid();
- }
fp_geoid=NULL;
model_geoid=GEOID_EMBEDDED;
}
@@ -532,9 +238,9 @@ extern void closegeoid(void)
extern double geoidh(const double *pos)
{
double posd[2],h;
-
+
posd[1]=pos[1]*R2D; posd[0]=pos[0]*R2D; if (posd[1]<0.0) posd[1]+=360.0;
-
+
if (posd[1]<0.0||360.0-1E-12<posd[1]||posd[0]<-90.0||90.0<posd[0]) {
trace(2,"out of range for geoid model: lat=%.3f lon=%.3f\n",posd[0],posd[1]);
return 0.0;
@@ -545,7 +251,6 @@ extern double geoidh(const double *pos)
case GEOID_EGM2008_M25: h=geoidh_egm08(posd,model_geoid); break;
case GEOID_EGM2008_M10: h=geoidh_egm08(posd,model_geoid); break;
case GEOID_GSI2000_M15: h=geoidh_gsi (posd); break;
- case GEOID_RAF09: h=geoidh_raf09(posd); break;
default: return 0.0;
}
if (fabs(h)>200.0) {
@@ -554,7 +259,6 @@ extern double geoidh(const double *pos)
}
return h;
}
-
/*------------------------------------------------------------------------------
* embedded geoid model
* notes : geoid heights are derived from EGM96 (1 x 1 deg grid)
diff --git a/src/rtklib.h b/src/rtklib.h
index 7941781c97bb61048f1f6f3c164b827f67149b17..30c592826480921b6ca677bf4974216cb9c2848b 100644
--- a/src/rtklib.h
+++ b/src/rtklib.h
@@ -432,7 +432,6 @@ extern "C" {
#define STR_UDPSVR 12 /* stream type: UDP server */
#define STR_UDPCLI 13 /* stream type: UDP server */
#define STR_MEMBUF 14 /* stream type: memory buffer */
-#define STR_UNIXSVR 15 /* stream type: unix domain socket server */
#define STRFMT_RTCM2 0 /* stream format: RTCM 2 */
#define STRFMT_RTCM3 1 /* stream format: RTCM 3 */
diff --git a/src/stream.c b/src/stream.c
index 88bc3914d0a71cc3375787271937a4352d3b9e30..9308c6e2e5cb37f3b6f4acd9b0ed6cec313b5190 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -73,7 +73,6 @@
#include <errno.h>
#include <termios.h>
#include <sys/socket.h>
-#include <sys/un.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
@@ -121,10 +120,6 @@ typedef int socklen_t;
#define closesocket close
#endif
-#ifndef SUN_LEN
-#define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path))
-#endif
-
/* type definition -----------------------------------------------------------*/
typedef struct { /* file control type */
@@ -243,22 +238,6 @@ typedef struct { /* ftp download control type */
thread_t thread; /* download thread */
} ftp_t;
-typedef struct { /* unix domain socket control type */
- int state; /* state (0:close,1:wait,2:connect) */
- char saddr[108]; /* address string */
- int port; /* port */
- struct sockaddr_un addr; /* address resolved */
- socket_t sock; /* socket descriptor */
- int tcon; /* reconnect time (ms) (-1:never,0:now) */
- unsigned int tact; /* data active tick */
- unsigned int tdis; /* disconnect tick */
-} unix_t;
-
-typedef struct { /* unix domain socket server type */
- unix_t svr; /* unix server control */
- unix_t cli[MAXCLI]; /* unix client controls */
-} unixsvr_t;
-
typedef struct { /* memory buffer type */
int state,wp,rp; /* state,write/read pointer */
int bufsize; /* buffer size (bytes) */
@@ -2538,212 +2517,6 @@ static int statexftp(ftp_t *ftp, char *msg)
{
return !ftp?0:(ftp->state==0?2:(ftp->state<=2?3:-1));
}
-
-/* generate unix socket -------------------------------------------------------*/
-static int genunix(unix_t *unx, char *msg)
-{
- tracet(3,"genunix\n");
-
- /* generate socket */
- if ((unx->sock=socket(AF_LOCAL,SOCK_STREAM,0))==(socket_t)-1) {
- sprintf(msg,"socket error (%d)",errsock());
- tracet(1,"genunix: socket error err=%d\n",errsock());
- unx->state=-1;
- return 0;
- }
- if (!setsock(unx->sock,msg)) {
- unx->state=-1;
- return 0;
- }
- memset(&unx->addr,0,sizeof(unx->addr));
- unx->addr.sun_family=AF_LOCAL;
- strncpy(unx->addr.sun_path, unx->saddr, sizeof(unx->addr.sun_path)-1);
-
- unlink(unx->addr.sun_path);
-
- if (bind(unx->sock,(struct sockaddr *)&unx->addr,SUN_LEN(&unx->addr))==-1) {
- sprintf(msg,"bind error (%d) ",errsock());
- tracet(1,"genunix: bind error path=%s err=%d\n",unx->addr.sun_path,errsock());
- closesocket(unx->sock);
- unx->state=-1;
- return 0;
- }
- listen(unx->sock,5);
- unx->state=1;
- unx->tact=tickget();
- tracet(5,"genunx: exit sock=%d\n",unx->sock);
- return 1;
-}
-/* disconnect unix socket ---------------------------------------------------*/
-static void disconunix(unix_t *unx, int tcon)
-{
- tracet(3,"disconunix: sock=%d tcon=%d\n",unx->sock,tcon);
-
- closesocket(unx->sock);
- unx->state=0;
- unx->tcon=tcon;
- unx->tdis=tickget();
-}
-/* open unix domain socket server --------------------------------------------*/
-static unixsvr_t *openunixsvr(const char *path, char *msg)
-{
- unixsvr_t *unixsvr,unixsvr0={{0}};
-
- tracet(3,"openunixsvr: path=%s\n",path);
-
- if (!(unixsvr=(unixsvr_t *)malloc(sizeof(unixsvr_t)))) return NULL;
- *unixsvr=unixsvr0;
- strncpy(unixsvr->svr.saddr, path, sizeof(unixsvr->svr.saddr)-1);
- if (!genunix(&unixsvr->svr,msg)) {
- free(unixsvr);
- return NULL;
- }
- unixsvr->svr.tcon=0;
- return unixsvr;
-}
-/* close unix server ----------------------------------------------------------*/
-static void closeunixsvr(unixsvr_t *unixsvr)
-{
- int i;
-
- tracet(3,"closeunixsvr:\n");
-
- for (i=0;i<MAXCLI;i++) {
- if (unixsvr->cli[i].state) closesocket(unixsvr->cli[i].sock);
- }
- closesocket(unixsvr->svr.sock);
- unlink(unixsvr->svr.addr.sun_path);
- free(unixsvr);
-}
-/* update unix server ---------------------------------------------------------*/
-static void updateunixsvr(unixsvr_t *unixsvr, char *msg)
-{
- char saddr[256]="";
- int i,j,n=0;
-
- tracet(3,"updateunixsvr: state=%d\n",unixsvr->svr.state);
-
- if (unixsvr->svr.state==0) return;
-
- for (i=0;i<MAXCLI;i++) {
- if (unixsvr->cli[i].state) continue;
- for (j=i+1;j<MAXCLI;j++) {
- if (!unixsvr->cli[j].state) continue;
- unixsvr->cli[i]=unixsvr->cli[j];
- unixsvr->cli[j].state=0;
- break;
- }
- }
- for (i=0;i<MAXCLI;i++) {
- if (!unixsvr->cli[i].state) continue;
- memcpy(saddr,unixsvr->cli[i].saddr, sizeof(unixsvr->cli[i].saddr));
- n++;
- }
- if (n==0) {
- unixsvr->svr.state=1;
- sprintf(msg,"waiting...");
- return;
- }
- unixsvr->svr.state=2;
- if (n==1) sprintf(msg,"%s",saddr); else sprintf(msg,"%d clients",n);
-}
-/* accept client connection --------------------------------------------------*/
-static int accunixsock(unixsvr_t *unixsvr, char *msg)
-{
- struct sockaddr_un addr;
- socket_t sock;
- socklen_t len=sizeof(addr);
- int i,err;
-
- tracet(3,"accunixsock: sock=%d\n",unixsvr->svr.sock);
-
- for (i=0;i<MAXCLI;i++) if (unixsvr->cli[i].state==0) break;
- if (i>=MAXCLI) return 0; /* too many client */
-
- if ((sock=accept_nb(unixsvr->svr.sock,(struct sockaddr *)&addr,&len))==(socket_t)-1) {
- err=errsock();
- sprintf(msg,"accept error (%d)",err);
- tracet(1,"accunixsock: accept error sock=%d err=%d\n",unixsvr->svr.sock,err);
- closesocket(unixsvr->svr.sock); unixsvr->svr.state=0;
- unlink(unixsvr->svr.addr.sun_path);
- return 0;
- }
- if (sock==0) return 0;
-
- unixsvr->cli[i].sock=sock;
- if (!setsock(unixsvr->cli[i].sock,msg)) return 0;
- memcpy(&unixsvr->cli[i].addr,&addr,sizeof(addr));
- memcpy(unixsvr->cli[i].saddr,addr.sun_path, sizeof(addr.sun_path));
- sprintf(msg,"%s",unixsvr->cli[i].saddr);
- tracet(2,"accunixsock: connected sock=%d addr=%s\n",unixsvr->cli[i].sock,unixsvr->cli[i].saddr);
- unixsvr->cli[i].state=2;
- unixsvr->cli[i].tact=tickget();
- return 1;
-}
-/* wait socket accept --------------------------------------------------------*/
-static int waitunixsvr(unixsvr_t *unixsvr, char *msg)
-{
- tracet(4,"waitunixsvr: sock=%d state=%d\n",unixsvr->svr.sock,unixsvr->svr.state);
-
- if (unixsvr->svr.state<=0) return 0;
-
- while (accunixsock(unixsvr,msg)) ;
-
- updateunixsvr(unixsvr,msg);
- return unixsvr->svr.state==2;
-}
-/* read unix server ----------------------------------------------------------*/
-static int readunixsvr(unixsvr_t *unixsvr, unsigned char *buff, int n, char *msg)
-{
- int nr,err;
-
- tracet(4,"readunixsvr: state=%d n=%d\n",unixsvr->svr.state,n);
-
- if (!waitunixsvr(unixsvr,msg)||unixsvr->cli[0].state!=2) return 0;
-
- if ((nr=recv_nb(unixsvr->cli[0].sock,buff,n))==-1) {
- err=errsock();
- tracet(1,"readunixsvr: recv error sock=%d err=%d\n",unixsvr->cli[0].sock,err);
- sprintf(msg,"recv error (%d)",err);
- disconunix(&unixsvr->cli[0],ticonnect);
- updateunixsvr(unixsvr,msg);
- return 0;
- }
- if (nr>0) unixsvr->cli[0].tact=tickget();
- tracet(5,"readunixsvr: exit sock=%d nr=%d\n",unixsvr->cli[0].sock,nr);
- return nr;
-}
-/* write unix server ---------------------------------------------------------*/
-static int writeunixsvr(unixsvr_t *unixsvr, unsigned char *buff, int n, char *msg)
-{
- int i,ns=0,err;
-
- tracet(3,"writeunixsvr: state=%d n=%d\n",unixsvr->svr.state,n);
-
- if (!waitunixsvr(unixsvr,msg)) return 0;
-
- for (i=0;i<MAXCLI;i++) {
- if (unixsvr->cli[i].state!=2) continue;
-
- if ((ns=send_nb(unixsvr->cli[i].sock,buff,n))==-1) {
- err=errsock();
- tracet(1,"writeunixsvr: send error i=%d sock=%d err=%d\n",i,unixsvr->cli[i].sock,err);
- sprintf(msg,"send error (%d)",err);
- disconunix(&unixsvr->cli[i],ticonnect);
- updateunixsvr(unixsvr,msg);
- return 0;
- }
- if (ns>0) unixsvr->cli[i].tact=tickget();
- tracet(5,"writeunixsvr: send i=%d ns=%d\n",i,ns);
- }
- return ns;
-}
-/* get state unix server -----------------------------------------------------*/
-static int stateunixsvr(unixsvr_t *unixsvr)
-{
- return unixsvr?unixsvr->svr.state:0;
-}
-
/* open memory buffer --------------------------------------------------------*/
static membuf_t *openmembuf(const char *path, char *msg)
{
@@ -2986,7 +2759,7 @@ extern void strinit(stream_t *stream)
* tint = download interval (s)
* toff = download time offset (s)
* tret = download retry interval (s) (0:no retry)
-* STR_UNIXSVR path
+*
*-----------------------------------------------------------------------------*/
extern int stropen(stream_t *stream, int type, int mode, const char *path)
{
@@ -3014,7 +2787,6 @@ extern int stropen(stream_t *stream, int type, int mode, const char *path)
case STR_MEMBUF : stream->port=openmembuf(path, stream->msg); break;
case STR_FTP : stream->port=openftp (path,0, stream->msg); break;
case STR_HTTP : stream->port=openftp (path,1, stream->msg); break;
- case STR_UNIXSVR : stream->port=openunixsvr(path, stream->msg); break;
default: stream->state=0; return 1;
}
stream->state=!stream->port?-1:1;
@@ -3046,7 +2818,6 @@ extern void strclose(stream_t *stream)
case STR_MEMBUF : closemembuf((membuf_t *)stream->port); break;
case STR_FTP : closeftp ((ftp_t *)stream->port); break;
case STR_HTTP : closeftp ((ftp_t *)stream->port); break;
- case STR_UNIXSVR : closeunixsvr ((unixsvr_t *)stream->port); break;
}
}
else {
@@ -3118,7 +2889,6 @@ extern int strread(stream_t *stream, unsigned char *buff, int n)
case STR_MEMBUF : nr=readmembuf((membuf_t *)stream->port,buff,n,msg); break;
case STR_FTP : nr=readftp ((ftp_t *)stream->port,buff,n,msg); break;
case STR_HTTP : nr=readftp ((ftp_t *)stream->port,buff,n,msg); break;
- case STR_UNIXSVR : nr=readunixsvr((unixsvr_t *)stream->port,buff,n,msg); break;
default:
strunlock(stream);
return 0;
@@ -3160,7 +2930,6 @@ extern int strwrite(stream_t *stream, unsigned char *buff, int n)
case STR_TCPCLI : ns=writetcpcli((tcpcli_t *)stream->port,buff,n,msg); break;
case STR_NTRIPSVR:
case STR_NTRIPCLI: ns=writentrip ((ntrip_t *)stream->port,buff,n,msg); break;
- case STR_UNIXSVR : ns=writeunixsvr((unixsvr_t *)stream->port,buff,n,msg); break;
case STR_NTRIPC_S:
case STR_NTRIPC_C: ns=writentripc((ntripc_t *)stream->port,buff,n,msg); break;
case STR_UDPCLI : ns=writeudpcli((udp_t *)stream->port,buff,n,msg); break;
@@ -3255,7 +3024,6 @@ extern int strstat(stream_t *stream, char *msg)
case STR_MEMBUF : state=statemembuf((membuf_t *)stream->port); break;
case STR_FTP : state=stateftp ((ftp_t *)stream->port); break;
case STR_HTTP : state=stateftp ((ftp_t *)stream->port); break;
- case STR_UNIXSVR : state=stateunixsvr((unixsvr_t *)stream->port); break;
default:
strunlock(stream);
return 0;