diff options
Diffstat (limited to 'src/include/libpq')
| -rw-r--r-- | src/include/libpq/libpq.h | 16 | ||||
| -rw-r--r-- | src/include/libpq/pqcomm.h | 4 | ||||
| -rw-r--r-- | src/include/libpq/pqformat.h | 12 |
3 files changed, 22 insertions, 10 deletions
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index 04248b5c95..cbe0b646e7 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.56 2003/01/25 05:19:47 tgl Exp $ + * $Id: libpq.h,v 1.57 2003/04/19 00:02:29 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -52,14 +52,24 @@ extern void StreamClose(int sock); extern void TouchSocketFile(void); extern void pq_init(void); extern int pq_getbytes(char *s, size_t len); -extern int pq_getstring(StringInfo s, int maxlen); +extern int pq_getstring(StringInfo s); +extern int pq_getmessage(StringInfo s, int maxlen); extern int pq_getbyte(void); extern int pq_peekbyte(void); extern int pq_putbytes(const char *s, size_t len); extern int pq_flush(void); -extern int pq_eof(void); extern int pq_putmessage(char msgtype, const char *s, size_t len); extern void pq_startcopyout(void); extern void pq_endcopyout(bool errorAbort); +/* + * prototypes for functions in be-secure.c + */ +extern int secure_initialize(void); +extern void secure_destroy(void); +extern int secure_open_server(Port *port); +extern void secure_close(Port *port); +extern ssize_t secure_read(Port *port, void *ptr, size_t len); +extern ssize_t secure_write(Port *port, void *ptr, size_t len); + #endif /* LIBPQ_H */ diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index fabfb0cb25..61aa695e27 100644 --- a/src/include/libpq/pqcomm.h +++ b/src/include/libpq/pqcomm.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.h,v 1.76 2003/04/17 22:26:01 tgl Exp $ + * $Id: pqcomm.h,v 1.77 2003/04/19 00:02:29 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -106,7 +106,7 @@ typedef union SockAddr /* The earliest and latest frontend/backend protocol version supported. */ #define PG_PROTOCOL_EARLIEST PG_PROTOCOL(1,0) -#define PG_PROTOCOL_LATEST PG_PROTOCOL(3,100) /* XXX temporary value */ +#define PG_PROTOCOL_LATEST PG_PROTOCOL(3,101) /* XXX temporary value */ typedef uint32 ProtocolVersion; /* FE/BE protocol version number */ diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h index 829727c38f..cb80ec2c20 100644 --- a/src/include/libpq/pqformat.h +++ b/src/include/libpq/pqformat.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqformat.h,v 1.13 2002/09/04 23:31:35 tgl Exp $ + * $Id: pqformat.h,v 1.14 2003/04/19 00:02:29 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -26,9 +26,11 @@ extern void pq_endmessage(StringInfo buf); extern int pq_puttextmessage(char msgtype, const char *str); -extern int pq_getint(int *result, int b); -extern int pq_getstr_bounded(StringInfo s, int maxlen); - -#define pq_getstr(s) pq_getstr_bounded(s, 0) +extern int pq_getmsgbyte(StringInfo msg); +extern unsigned int pq_getmsgint(StringInfo msg, int b); +extern const char *pq_getmsgbytes(StringInfo msg, int datalen); +extern void pq_copymsgbytes(StringInfo msg, char *buf, int datalen); +extern const char *pq_getmsgstring(StringInfo msg); +extern void pq_getmsgend(StringInfo msg); #endif /* PQFORMAT_H */ |