diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2012-07-13 12:33:04 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2012-07-13 12:33:04 +0400 |
| commit | 0575ad5069b4bf44ec62e4db172d2590ec7fb956 (patch) | |
| tree | de98479fc6426ad26a9c814259ba59f2a7d413ee /accel-pppd/ctrl/l2tp/l2tp.c | |
| parent | 0df0604e7606b38f1f3fc4a2c92dbad720654f3c (diff) | |
| parent | 0b99fef73bce3f1abed63e581594de9d1f132312 (diff) | |
| download | accel-ppp-xebd-0575ad5069b4bf44ec62e4db172d2590ec7fb956.tar.gz accel-ppp-xebd-0575ad5069b4bf44ec62e4db172d2590ec7fb956.zip | |
Merge commit '0b99fef73bce3f1abed63e581594de9d1f132312'
* commit '0b99fef73bce3f1abed63e581594de9d1f132312':
L2TP: Fix socket() error handling in l2tp_connect()
iprange: accept network with null mask (which actually disables iprange module)
Diffstat (limited to 'accel-pppd/ctrl/l2tp/l2tp.c')
| -rw-r--r-- | accel-pppd/ctrl/l2tp/l2tp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 0ad8649..e85876e 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -386,7 +386,7 @@ static int l2tp_connect(struct l2tp_conn_t *conn) pppox_addr.pppol2tp.d_tunnel = conn->peer_tid; conn->tunnel_fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP); - if (!conn->ppp.fd) { + if (conn->tunnel_fd < 0) { log_ppp_error("l2tp: socket(AF_PPPOX): %s\n", strerror(errno)); return -1; } @@ -394,13 +394,13 @@ static int l2tp_connect(struct l2tp_conn_t *conn) fcntl(conn->tunnel_fd, F_SETFD, fcntl(conn->tunnel_fd, F_GETFD) | FD_CLOEXEC); conn->ppp.fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP); - if (!conn->ppp.fd) { + if (conn->ppp.fd < 0) { close(conn->tunnel_fd); conn->tunnel_fd = -1; log_ppp_error("l2tp: socket(AF_PPPOX): %s\n", strerror(errno)); return -1; } - + fcntl(conn->ppp.fd, F_SETFD, fcntl(conn->ppp.fd, F_GETFD) | FD_CLOEXEC); if (connect(conn->tunnel_fd, (struct sockaddr *)&pppox_addr, sizeof(pppox_addr)) < 0) { |