diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2013-04-16 07:45:20 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2013-04-16 07:45:20 +0000 |
| commit | 1c7bd24c73235edb192e96f37f026c0d91e140b8 (patch) | |
| tree | 967d9cf65662fbab0fe950dfd55a51527636985d /usr.sbin | |
| parent | 4275a58be3541aca931eee8a91a1f1e026867a31 (diff) | |
Fix some AVPs of SCCRP to comply RFC 2661.
- Firmware revision and vendor name AVP are not mandatory.
- Hostname AVP must have 1 octect at least.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/npppd/l2tp/l2tp_ctrl.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/usr.sbin/npppd/l2tp/l2tp_ctrl.c b/usr.sbin/npppd/l2tp/l2tp_ctrl.c index 141f3a71f73..d9f2a6c63c2 100644 --- a/usr.sbin/npppd/l2tp/l2tp_ctrl.c +++ b/usr.sbin/npppd/l2tp/l2tp_ctrl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: l2tp_ctrl.c,v 1.14 2012/11/13 06:34:13 yasuoka Exp $ */ +/* $OpenBSD: l2tp_ctrl.c,v 1.15 2013/04/16 07:45:19 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /**@file Control connection processing functions for L2TP LNS */ -/* $Id: l2tp_ctrl.c,v 1.14 2012/11/13 06:34:13 yasuoka Exp $ */ +/* $Id: l2tp_ctrl.c,v 1.15 2013/04/16 07:45:19 yasuoka Exp $ */ #include <sys/types.h> #include <sys/param.h> #include <sys/time.h> @@ -1477,7 +1477,7 @@ l2tp_ctrl_send_SCCRP(l2tp_ctrl *_this) { int len; struct l2tp_avp *avp; - char buf[L2TP_AVP_MAXSIZ]; + char buf[L2TP_AVP_MAXSIZ], hbuf[MAXHOSTNAMELEN]; const char *val; bytebuffer *bytebuf; @@ -1514,8 +1514,10 @@ l2tp_ctrl_send_SCCRP(l2tp_ctrl *_this) memset(avp, 0, sizeof(*avp)); avp->is_mandatory = 1; avp->attr_type = L2TP_AVP_TYPE_HOST_NAME; - if ((val = L2TP_CTRL_CONF(_this)->hostname) == NULL) - val = ""; + if ((val = L2TP_CTRL_CONF(_this)->hostname) == NULL) { + gethostname(hbuf, sizeof(hbuf)); + val = hbuf; + } len = strlen(val); memcpy(avp->attr_value, val, len); bytebuf_add_avp(bytebuf, avp, len); @@ -1539,23 +1541,22 @@ l2tp_ctrl_send_SCCRP(l2tp_ctrl *_this) /* Firmware Revision */ memset(avp, 0, sizeof(*avp)); - avp->is_mandatory = 1; + avp->is_mandatory = 0; avp->attr_type = L2TP_AVP_TYPE_FIRMWARE_REVISION; avp->attr_value[0] = MAJOR_VERSION; avp->attr_value[1] = MINOR_VERSION; bytebuf_add_avp(bytebuf, avp, 2); - /* Host Name */ - memset(avp, 0, sizeof(*avp)); - avp->is_mandatory = 1; - avp->attr_type = L2TP_AVP_TYPE_VENDOR_NAME; + /* Vendor Name */ + if ((val = L2TP_CTRL_CONF(_this)->vendor_name) != NULL) { + memset(avp, 0, sizeof(*avp)); + avp->is_mandatory = 0; + avp->attr_type = L2TP_AVP_TYPE_VENDOR_NAME; - if ((val = L2TP_CTRL_CONF(_this)->vendor_name) == NULL) - val = L2TPD_VENDOR_NAME; - - len = strlen(val); - memcpy(avp->attr_value, val, len); - bytebuf_add_avp(bytebuf, avp, len); + len = strlen(val); + memcpy(avp->attr_value, val, len); + bytebuf_add_avp(bytebuf, avp, len); + } /* Window Size */ memset(avp, 0, sizeof(*avp)); |