backport 1.7

* l2tp: Fix allocation checking when adding octets AVP
* cli, tcp: Fix non-NULL terminated string reception
* Fix va_end() missing calls
* chap-secrets: implemented encryption
* auth_pap: make messages like other auth modules
* cli: check xmit_buf is not null at enter to write function
* pppoe: implemented regular expression support
* chap-secrets: implemented encryption
* ippool: fixed initialization order
* optional shaper compiling
* ppp: dns/wins code cleanup

1 files changed, 7 insertions, 3 deletions

diff --git a/accel-pppd/cli/tcp.c b/accel-pppd/cli/tcp.c
index b2ed9105..48fa01a2 100644
--- a/accel-pppd/cli/tcp.c
+++ b/accel-pppd/cli/tcp.c
@@ -144,7 +144,7 @@ static int cln_read(struct triton_md_handler_t *h)
 	char *d;
 
 	while (1) {
-		n = read(h->fd, cln->cmdline + cln->recv_pos, RECV_BUF_SIZE - cln->recv_pos);
+		n = read(h->fd, cln->cmdline + cln->recv_pos, RECV_BUF_SIZE - 1 - cln->recv_pos);
 		if (n == 0)
 			break;
 		if (n < 0) {
@@ -154,11 +154,12 @@ static int cln_read(struct triton_md_handler_t *h)
 		}
 
 		cln->recv_pos += n;
-		
+		cln->cmdline[cln->recv_pos] = '\0';
+
 		while (cln->recv_pos) {
 			d = strchr((char *)cln->cmdline, '\n');
 			if (!d) {
-				if (cln->recv_pos == RECV_BUF_SIZE) {
+				if (cln->recv_pos == RECV_BUF_SIZE - 1) {
 					log_warn("cli: tcp: recv buffer overflow\n");
 					goto drop;
 				}
@@ -192,6 +193,9 @@ static int cln_write(struct triton_md_handler_t *h)
 	struct tcp_client_t *cln = container_of(h, typeof(*cln), hnd);
 	int k;
 	
+	if (!cln->xmit_buf)
+		return 0;
+	
 	while (1) {
 		for (; cln->xmit_pos < cln->xmit_buf->size; cln->xmit_pos += k) {
 			k = write(cln->hnd.fd, cln->xmit_buf->buf + cln->xmit_pos, cln->xmit_buf->size - cln->xmit_pos);