1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
/*
* Part of Very Secure FTPd
* Licence: GPL v2
* Author: Chris Evans
* netstr.c
*
* The netstr interface extends the standard string interface, adding
* functions which can cope safely with building strings from the network,
* and send them out too.
*/
#include "netstr.h"
#include "str.h"
#include "sysstr.h"
#include "utility.h"
#include "sysutil.h"
int
str_netfd_alloc(struct vsf_session* p_sess,
struct mystr* p_str,
char term,
char* p_readbuf,
unsigned int maxlen,
str_netfd_read_t p_peekfunc,
str_netfd_read_t p_readfunc)
{
int retval;
unsigned int bytes_read;
unsigned int i;
char* p_readpos = p_readbuf;
unsigned int left = maxlen;
while (1)
{
if (p_readpos + left != p_readbuf + maxlen)
{
bug("poor buffer accounting in str_netfd_alloc");
}
/* Did we hit the max? */
if (left == 0)
{
str_empty(p_str);
return -1;
}
retval = (*p_peekfunc)(p_sess, p_readpos, left);
if (vsf_sysutil_retval_is_error(retval))
{
die("vsf_sysutil_recv_peek");
}
else if (retval == 0)
{
die("vsf_sysutil_recv_peek: no data");
}
bytes_read = (unsigned int) retval;
/* Search for the terminator */
for (i=0; i < bytes_read; i++)
{
if (p_readpos[i] == term)
{
/* Got it! */
retval = (*p_readfunc)(p_sess, p_readpos, i + 1);
if (vsf_sysutil_retval_is_error(retval) ||
(unsigned int) retval != i + 1)
{
die("vsf_sysutil_read_loop");
}
if (p_readpos[i] != term)
{
die("missing terminator in str_netfd_alloc");
}
str_alloc_alt_term(p_str, p_readbuf, term);
return (int) i;
}
}
/* Not found in this read chunk, so consume the data and re-loop */
if (bytes_read > left)
{
bug("bytes_read > left in str_netfd_alloc");
}
left -= bytes_read;
retval = (*p_readfunc)(p_sess, p_readpos, bytes_read);
if (vsf_sysutil_retval_is_error(retval) ||
(unsigned int) retval != bytes_read)
{
die("vsf_sysutil_read_loop");
}
p_readpos += bytes_read;
} /* END: while(1) */
}
int
str_netfd_write(const struct mystr* p_str, int fd)
{
int ret = 0;
int retval;
unsigned int str_len = str_getlen(p_str);
if (str_len == 0)
{
bug("zero str_len in str_netfd_write");
}
retval = str_write_loop(p_str, fd);
if (vsf_sysutil_retval_is_error(retval) || (unsigned int) retval != str_len)
{
ret = -1;
}
return ret;
}
int
str_netfd_read(struct mystr* p_str, int fd, unsigned int len)
{
int retval;
str_reserve(p_str, len);
str_trunc(p_str, len);
retval = str_read_loop(p_str, fd);
if (vsf_sysutil_retval_is_error(retval) || (unsigned int) retval != len)
{
return -1;
}
return retval;
}
|