projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include of odr_use.h in odr.h. Added prototype for odr_enum.
[yaz-moved-to-github.git]
/
comstack
/
tcpip.c
diff --git
a/comstack/tcpip.c
b/comstack/tcpip.c
index
add3791
..
3a99bd0
100644
(file)
--- a/
comstack/tcpip.c
+++ b/
comstack/tcpip.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
- * Revision 1.17 1997-09-17 12:10:30 adam
+ * Revision 1.19 1998-02-11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.18 1997/09/29 07:15:25 adam
+ * Changed use of setsockopt to avoid warnings on MSVC.
+ *
+ * Revision 1.17 1997/09/17 12:10:30 adam
* YAZ version 1.4.
*
* Revision 1.16 1997/09/01 08:49:14 adam
* YAZ version 1.4.
*
* Revision 1.16 1997/09/01 08:49:14 adam
@@
-133,6
+139,10
@@
#include <comstack.h>
#include <tcpip.h>
#include <comstack.h>
#include <tcpip.h>
+/* Chas added the following 2, so we get the definition of completeBER */
+#include <odr.h>
+#include <prt.h>
+
int tcpip_close(COMSTACK h);
int tcpip_put(COMSTACK h, char *buf, int size);
int tcpip_get(COMSTACK h, char **buf, int *bufsize);
int tcpip_close(COMSTACK h);
int tcpip_put(COMSTACK h, char *buf, int size);
int tcpip_get(COMSTACK h, char **buf, int *bufsize);
@@
-148,7
+158,9
@@
void *tcpip_straddr(COMSTACK h, const char *str);
/*
* Determine length/completeness of incoming packages
*/
/*
* Determine length/completeness of incoming packages
*/
-int completeBER(unsigned char *buf, int len); /* from the ODR module */
+/* Chas: Removed the definition of completeBERfrom here, use the one in the */
+/* include directory as that as the extern "C" around it */
+/*int completeBER(unsigned char *buf, int len); */ /* from the ODR module */
int completeWAIS(unsigned char *buf, int len); /* from waislen.c */
#ifdef TRACE_TCPIP
int completeWAIS(unsigned char *buf, int len); /* from waislen.c */
#ifdef TRACE_TCPIP
@@
-223,9
+235,10
@@
COMSTACK tcpip_type(int s, int blocking, int protocol)
}
else
new_socket = 0;
}
else
new_socket = 0;
- if (!(p = xmalloc(sizeof(struct comstack))))
+ if (!(p = (struct comstack *)xmalloc(sizeof(struct comstack))))
return 0;
return 0;
- if (!(state = p->cprivate = xmalloc(sizeof(tcpip_state))))
+ if (!(state = (struct tcpip_state *)(p->cprivate =
+ xmalloc(sizeof(tcpip_state)))))
return 0;
#ifdef WINDOWS
return 0;
#ifdef WINDOWS
@@
-302,7
+315,7
@@
static int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add)
void *tcpip_straddr(COMSTACK h, const char *str)
{
void *tcpip_straddr(COMSTACK h, const char *str)
{
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
if (!tcpip_strtoaddr_ex (str, &sp->addr))
return 0;
if (!tcpip_strtoaddr_ex (str, &sp->addr))
return 0;
@@
-320,7
+333,7
@@
struct sockaddr_in *tcpip_strtoaddr(const char *str)
int tcpip_more(COMSTACK h)
{
int tcpip_more(COMSTACK h)
{
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
sp->altlen);
return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
sp->altlen);
@@
-333,7
+346,7
@@
int tcpip_more(COMSTACK h)
*/
int tcpip_connect(COMSTACK h, void *address)
{
*/
int tcpip_connect(COMSTACK h, void *address)
{
- struct sockaddr_in *add = address;
+ struct sockaddr_in *add = (struct sockaddr_in *)address;
TRC(fprintf(stderr, "tcpip_connect\n"));
if (connect(h->iofile, (struct sockaddr *) add, sizeof(*add)) < 0)
TRC(fprintf(stderr, "tcpip_connect\n"));
if (connect(h->iofile, (struct sockaddr *) add, sizeof(*add)) < 0)
@@
-361,11
+374,16
@@
int tcpip_rcvconnect(COMSTACK h)
int tcpip_bind(COMSTACK h, void *address, int mode)
{
int tcpip_bind(COMSTACK h, void *address, int mode)
{
- struct sockaddr *addr = address;
+ struct sockaddr *addr = (struct sockaddr *)address;
+#ifdef WINDOWS
+ BOOL one = 1;
+#else
unsigned long one = 1;
unsigned long one = 1;
+#endif
TRC(fprintf(stderr, "tcpip_bind\n"));
TRC(fprintf(stderr, "tcpip_bind\n"));
- if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
+ if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (char*)
+ &one, sizeof(one)) < 0)
{
h->cerrno = CSYSERR;
return -1;
{
h->cerrno = CSYSERR;
return -1;
@@
-419,7
+437,7
@@
int tcpip_listen(COMSTACK h, char *raddr, int *addrlen)
COMSTACK tcpip_accept(COMSTACK h)
{
COMSTACK cnew;
COMSTACK tcpip_accept(COMSTACK h)
{
COMSTACK cnew;
- tcpip_state *state, *st = h->cprivate;
+ tcpip_state *state, *st = (tcpip_state *)h->cprivate;
#ifdef WINDOWS
unsigned long tru = 1;
#endif
#ifdef WINDOWS
unsigned long tru = 1;
#endif
@@
-430,14
+448,14
@@
COMSTACK tcpip_accept(COMSTACK h)
h->cerrno = CSOUTSTATE;
return 0;
}
h->cerrno = CSOUTSTATE;
return 0;
}
- if (!(cnew = xmalloc(sizeof(*cnew))))
+ if (!(cnew = (COMSTACK)xmalloc(sizeof(*cnew))))
{
h->cerrno = CSYSERR;
return 0;
}
memcpy(cnew, h, sizeof(*h));
cnew->iofile = h->newfd;
{
h->cerrno = CSYSERR;
return 0;
}
memcpy(cnew, h, sizeof(*h));
cnew->iofile = h->newfd;
- if (!(state = cnew->cprivate = xmalloc(sizeof(tcpip_state))))
+ if (!(state = (tcpip_state *)(cnew->cprivate = xmalloc(sizeof(tcpip_state)))))
{
h->cerrno = CSYSERR;
return 0;
{
h->cerrno = CSYSERR;
return 0;
@@
-465,7
+483,7
@@
COMSTACK tcpip_accept(COMSTACK h)
*/
int tcpip_get(COMSTACK h, char **buf, int *bufsize)
{
*/
int tcpip_get(COMSTACK h, char **buf, int *bufsize)
{
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
char *tmpc;
int tmpi, berlen, rest, req, tomove;
int hasread = 0, res;
char *tmpc;
int tmpi, berlen, rest, req, tomove;
int hasread = 0, res;
@@
-488,11
+506,11
@@
int tcpip_get(COMSTACK h, char **buf, int *bufsize)
{
if (!*bufsize)
{
{
if (!*bufsize)
{
- if (!(*buf = xmalloc(*bufsize = CS_TCPIP_BUFCHUNK)))
+ if (!(*buf = (char *)xmalloc(*bufsize = CS_TCPIP_BUFCHUNK)))
return -1;
}
else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
return -1;
}
else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
- if (!(*buf =xrealloc(*buf, *bufsize *= 2)))
+ if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2)))
return -1;
if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0)
#ifdef WINDOWS
return -1;
if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0)
#ifdef WINDOWS
@@
-519,10
+537,10
@@
int tcpip_get(COMSTACK h, char **buf, int *bufsize)
req += CS_TCPIP_BUFCHUNK - rest;
if (!sp->altbuf)
{
req += CS_TCPIP_BUFCHUNK - rest;
if (!sp->altbuf)
{
- if (!(sp->altbuf = xmalloc(sp->altsize = req)))
+ if (!(sp->altbuf = (char *)xmalloc(sp->altsize = req)))
return -1;
} else if (sp->altsize < req)
return -1;
} else if (sp->altsize < req)
- if (!(sp->altbuf =xrealloc(sp->altbuf, sp->altsize = req)))
+ if (!(sp->altbuf =(char *)xrealloc(sp->altbuf, sp->altsize = req)))
return -1;
TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove,
(unsigned) sp->altbuf));
return -1;
TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove,
(unsigned) sp->altbuf));
@@
-541,7
+559,7
@@
int tcpip_get(COMSTACK h, char **buf, int *bufsize)
int tcpip_put(COMSTACK h, char *buf, int size)
{
int res;
int tcpip_put(COMSTACK h, char *buf, int size)
{
int res;
- struct tcpip_state *state = h->cprivate;
+ struct tcpip_state *state = (struct tcpip_state *)h->cprivate;
TRC(fprintf(stderr, "tcpip_put: size=%d\n", size));
if (state->towrite < 0)
TRC(fprintf(stderr, "tcpip_put: size=%d\n", size));
if (state->towrite < 0)
@@
-582,7
+600,7
@@
int tcpip_put(COMSTACK h, char *buf, int size)
int tcpip_close(COMSTACK h)
{
int tcpip_close(COMSTACK h)
{
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (struct tcpip_state *)h->cprivate;
TRC(fprintf(stderr, "tcpip_close\n"));
if (h->iofile != -1)
TRC(fprintf(stderr, "tcpip_close\n"));
if (h->iofile != -1)
@@
-601,7
+619,7
@@
int tcpip_close(COMSTACK h)
char *tcpip_addrstr(COMSTACK h)
{
struct sockaddr_in addr;
char *tcpip_addrstr(COMSTACK h)
{
struct sockaddr_in addr;
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (struct tcpip_state *)h->cprivate;
char *r, *buf = sp->buf;
int len;
struct hostent *host;
char *r, *buf = sp->buf;
int len;
struct hostent *host;