Merge pull request #323 from nuclearcat/stability-fixes

Stability fixes

2 files changed, 8 insertions, 5 deletions

diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c
index d543a129..0cc23180 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.c
+++ b/accel-pppd/ctrl/pppoe/pppoe.c
@@ -298,9 +298,15 @@ static void pppoe_conn_ctx_switch(struct triton_context_t *ctx, void *arg)
 
 static struct pppoe_conn_t *allocate_channel(struct pppoe_serv_t *serv, const uint8_t *addr, const struct pppoe_tag *host_uniq, const struct pppoe_tag *relay_sid, const struct pppoe_tag *service_name, const struct pppoe_tag *tr101, const uint8_t *cookie, uint16_t ppp_max_payload)
 {
+	struct pppoe_tag empty_service_name = {
+		.tag_type = htons(TAG_SERVICE_NAME),
+	};
 	struct pppoe_conn_t *conn;
 	unsigned long *old_sid_ptr;
 
+	if (!service_name)
+		service_name = &empty_service_name;
+
 	conn = mempool_alloc(conn_pool);
 	if (!conn) {
 		log_error("pppoe: out of memory\n");
diff --git a/accel-pppd/ctrl/sstp/sstp.c b/accel-pppd/ctrl/sstp/sstp.c
index 21c519fa..6c2b9ca9 100644
--- a/accel-pppd/ctrl/sstp/sstp.c
+++ b/accel-pppd/ctrl/sstp/sstp.c
@@ -1240,7 +1240,7 @@ static int ppp_write(struct triton_md_handler_t *h)
 	ssize_t n;
 	int i;
 
-	if (!list_empty(&conn->ppp_queue)) {
+	while (!list_empty(&conn->ppp_queue)) {
 		i = n = 0;
 		list_for_each_entry(buf, &conn->ppp_queue, entry) {
 			if (i < PPP_BUF_IOVEC && n < PPP_BUF_SIZE) {
@@ -1272,9 +1272,6 @@ static int ppp_write(struct triton_md_handler_t *h)
 			list_del(&buf->entry);
 			free_buf(buf);
 		} while (n > 0);
-
-		if (!list_empty(&conn->ppp_queue))
-			goto defer;
 	}
 	triton_md_disable_handler(h, MD_MODE_WRITE);
 	return 0;
@@ -1849,7 +1846,7 @@ static int sstp_recv_data_packet(struct sstp_conn_t *conn, struct sstp_hdr *hdr)
 
 	buf_put_data(buf, hdr->data, size);
 #else
-	buf = alloc_buf(size*2 + 2 + PPP_FCSLEN);
+	buf = alloc_buf(size*2 + 2 + PPP_FCSLEN*2);
 	if (!buf) {
 		log_error("sstp: no memory\n");
 		return -1;