diff options
| author | Kozlov Dmitry <dima@server> | 2012-11-15 14:21:35 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2013-01-24 23:51:33 +0400 |
| commit | 45026d43f6cfbe0f6efa446b47629cb948db5a9d (patch) | |
| tree | be206f8519ba8169f7ca8e87f0cfc66b63ef9a74 /accel-pppd/ppp | |
| parent | 227298572c50013225752ff3af13ffc724d26ddf (diff) | |
| download | accel-ppp-45026d43f6cfbe0f6efa446b47629cb948db5a9d.tar.gz accel-ppp-45026d43f6cfbe0f6efa446b47629cb948db5a9d.zip | |
merge upstream
Diffstat (limited to 'accel-pppd/ppp')
| -rw-r--r-- | accel-pppd/ppp/ppp_ipcp.h | 2 | ||||
| -rw-r--r-- | accel-pppd/ppp/ppp_lcp.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/accel-pppd/ppp/ppp_ipcp.h b/accel-pppd/ppp/ppp_ipcp.h index 301bdcec..74127020 100644 --- a/accel-pppd/ppp/ppp_ipcp.h +++ b/accel-pppd/ppp/ppp_ipcp.h @@ -12,6 +12,8 @@ #define CI_ADDR 3 /* IP-Address */ #define CI_DNS1 129 /* Primary-DNS-Address */ #define CI_DNS2 131 /* Secondary-DNS-Address */ +#define CI_WINS1 130 /* Primary-NBNS-Address */ +#define CI_WINS2 132 /* Secondary-NBNS-Address */ struct ipcp_hdr_t { diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index 2d1e195d..7bec6294 100644 --- a/accel-pppd/ppp/ppp_lcp.c +++ b/accel-pppd/ppp/ppp_lcp.c @@ -683,10 +683,10 @@ static void send_echo_request(struct triton_timer_t *t) return; } - if (conf_ppp_verbose) { - log_ppp_debug("send [LCP EchoReq id=%x <magic %x>]\n", msg.hdr.id, msg.magic); - ppp_chan_send(lcp->ppp,&msg,ntohs(msg.hdr.len)+2); - } + if (conf_ppp_verbose) + log_ppp_debug("send [LCP EchoReq id=%x <magic %x>]\n", msg.hdr.id, lcp->magic); + + ppp_chan_send(lcp->ppp, &msg, ntohs(msg.hdr.len) + 2); } static void start_echo(struct ppp_lcp_t *lcp) |