diff options
author | harti <harti@FreeBSD.org> | 2005-05-23 13:08:32 +0000 |
---|---|---|
committer | harti <harti@FreeBSD.org> | 2005-05-23 13:08:32 +0000 |
commit | 92345ef8b89641bcfbce8c4060b1af8747b09919 (patch) | |
tree | 8e58ae24280f1529f33df6c15bb71be57418be7b /sys/contrib/ngatm | |
parent | ae767d0b063bc37f6cf82cf3d44981635ae768bc (diff) | |
parent | 64a08be33ad85f3c5d51d97ec56531248ccdd166 (diff) | |
download | FreeBSD-src-92345ef8b89641bcfbce8c4060b1af8747b09919.zip FreeBSD-src-92345ef8b89641bcfbce8c4060b1af8747b09919.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r146539,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'sys/contrib/ngatm')
-rw-r--r-- | sys/contrib/ngatm/netnatm/api/ccpriv.h | 2 | ||||
-rw-r--r-- | sys/contrib/ngatm/netnatm/api/unisap.h | 3 | ||||
-rw-r--r-- | sys/contrib/ngatm/netnatm/msg/uni_ie.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sys/contrib/ngatm/netnatm/api/ccpriv.h b/sys/contrib/ngatm/netnatm/api/ccpriv.h index 85bf9b7..c0f3075 100644 --- a/sys/contrib/ngatm/netnatm/api/ccpriv.h +++ b/sys/contrib/ngatm/netnatm/api/ccpriv.h @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $Begemot: libunimsg/netnatm/api/ccpriv.h,v 1.2 2005/05/23 11:49:17 brandt_h Exp $ * * ATM API as defined per af-saa-0108 * diff --git a/sys/contrib/ngatm/netnatm/api/unisap.h b/sys/contrib/ngatm/netnatm/api/unisap.h index 004feb7..ffbfc9f 100644 --- a/sys/contrib/ngatm/netnatm/api/unisap.h +++ b/sys/contrib/ngatm/netnatm/api/unisap.h @@ -26,8 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: libunimsg/netnatm/api/unisap.h,v 1.5 2004/07/08 08:22:01 brandt Exp $ - * $FreeBSD$ + * $Begemot: libunimsg/netnatm/api/unisap.h,v 1.6 2005/05/23 11:49:17 brandt_h Exp $ */ #ifndef _NETNATM_API_UNISAP_H_ #define _NETNATM_API_UNISAP_H_ diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ie.c b/sys/contrib/ngatm/netnatm/msg/uni_ie.c index 100fe81..c58377c 100644 --- a/sys/contrib/ngatm/netnatm/msg/uni_ie.c +++ b/sys/contrib/ngatm/netnatm/msg/uni_ie.c @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt <harti@freebsd.org> * - * $Begemot: libunimsg/netnatm/msg/uni_ie.c,v 1.15 2004/08/05 07:10:59 brandt Exp $ + * $Begemot: libunimsg/netnatm/msg/uni_ie.c,v 1.16 2005/05/23 12:06:30 brandt_h Exp $ * * Private definitions for the IE code file. * @@ -6235,6 +6235,7 @@ DEF_IE_DECODE(net, called_soft) if(!vpi_seen) { ie->vpi = *msg->b_rptr++ << 8; ie->vpi |= *msg->b_rptr++; + vpi_seen = 1; } else { msg->b_rptr += 2; } @@ -6246,6 +6247,7 @@ DEF_IE_DECODE(net, called_soft) if(!vci_seen) { ie->vci = *msg->b_rptr++ << 8; ie->vci |= *msg->b_rptr++; + vci_seen = 1; } else { msg->b_rptr += 2; } |