return ++seq;
}
-/*
- * Collapse multiple cookies on one line
- */
-int ReqGetStrBuf(int *sock, StrBuf *Target, StrBuf *buf)
-{
-
- return ClientGetLine(sock, Target, buf);
-}
-
-
/*
* lingering_close() a`la Apache. see
*/
void context_loop(int *sock)
{
+ const char *Pos = NULL;
const char *buf;
int desired_session = 0;
int got_cookie = 0;
do {
nLine ++;
Line = NewStrBuf();
- if (ReqGetStrBuf(sock, Line, Buf) < 0) return;
+
+
+ if (ClientGetLine(sock, Line, Buf, &Pos) < 0) return;
LineLen = StrLength(Line);
LastLine = Line;
} while (LineLen > 0);
FreeStrBuf(&HeaderName);
+ /* finish linebuffered fast reading, cut the read part: */
+ StrBufCutLeft(Buf, Pos - ChrPtr(Buf));
-/*/// dbg_PrintHash(HTTPHeaders, nix, NULL); */
+ dbg_PrintHash(HTTPHeaders, nix, NULL);
/*
void serv_read(char *buf, int bytes)
{
wcsession *WCC = WC;
+
+ WCC->ReadPos = NULL;
+
_serv_read(buf, bytes, WCC);
}
int ch, len;
char buf[2];
+ WCC->ReadPos = NULL;
len = 0;
strbuf[0] = 0;
do {
int StrBuf_ServGetln(StrBuf *buf)
{
+ wcsession *WCC = WC;
const char *ErrStr;
int rc;
- rc = StrBufTCP_read_line(buf, &WC->serv_sock, 0, &ErrStr);
+ WCC->ReadPos = NULL;
+ rc = StrBufTCP_read_line(buf, &WCC->serv_sock, 0, &ErrStr);
if (rc < 0)
{
lprintf(1, "Server connection broken: %s\n",
ErrStr);
wc_backtrace();
- WC->serv_sock = (-1);
- WC->connected = 0;
- WC->logged_in = 0;
+ WCC->serv_sock = (-1);
+ WCC->connected = 0;
+ WCC->logged_in = 0;
}
return rc;
}
const char *ErrStr;
int rc;
- rc = StrBufTCP_read_buffered_line(buf,
- WCC->ReadBuf,
- &WCC->serv_sock,
- 5, 1,
- &ErrStr);
+ rc = StrBufTCP_read_buffered_line_fast(buf,
+ WCC->ReadBuf,
+ &WCC->ReadPos,
+ &WCC->serv_sock,
+ 5, 1,
+ &ErrStr);
if (rc < 0)
{
lprintf(1, "Server connection broken: %s\n",
int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize)
{
+ wcsession *WCC = WC;
const char *Err;
int rc;
- rc = StrBufReadBLOB(buf, &WC->serv_sock, 1, BlobSize, &Err);
+ WCC->ReadPos = NULL;
+ rc = StrBufReadBLOB(buf, &WCC->serv_sock, 1, BlobSize, &Err);
if (rc < 0)
{
lprintf(1, "Server connection broken: %s\n",
Err);
wc_backtrace();
- WC->serv_sock = (-1);
- WC->connected = 0;
- WC->logged_in = 0;
+ WCC->serv_sock = (-1);
+ WCC->connected = 0;
+ WCC->logged_in = 0;
}
return rc;
}
*/
void serv_puts(const char *string)
{
+ wcsession *WCC = WC;
#ifdef SERV_TRACE
lprintf(9, "%3d<%s\n", WC->serv_sock, string);
#endif
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
+
serv_write(string, strlen(string));
serv_write("\n", 1);
}
*/
void serv_putbuf(const StrBuf *string)
{
+ wcsession *WCC = WC;
#ifdef SERV_TRACE
lprintf(9, "%3d<%s\n", WC->serv_sock, ChrPtr(string));
#endif
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
+
serv_write(ChrPtr(string), StrLength(string));
serv_write("\n", 1);
}
*/
void serv_printf(const char *format,...)
{
+ wcsession *WCC = WC;
va_list arg_ptr;
char buf[SIZ];
size_t len;
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
+
va_start(arg_ptr, format);
vsnprintf(buf, sizeof buf, format, arg_ptr);
va_end(arg_ptr);
}
-int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf)
+int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf, const char **Pos)
{
const char *Error, *pch, *pchs;
int rlen, len, retval = 0;
return -1;
}
else
- return StrBufTCP_read_buffered_line(Target,
- CLineBuf,
- sock,
- 5,
- 1,
- &Error);
+ return StrBufTCP_read_buffered_line_fast(Target,
+ CLineBuf,
+ Pos,
+ sock,
+ 5,
+ 1,
+ &Error);
}
extern int ndirs;
extern char socket_dir[PATH_MAX];
-int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf);
+int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf, const char **Pos);
int client_getln(int *sock, char *buf, int bufsiz);
int client_read(int *sock, StrBuf *Target, StrBuf *buf, int bytes);
int client_read_to(int *sock, StrBuf *Target, StrBuf *Buf, int bytes, int timeout);