diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2008-12-28 20:08:32 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2008-12-28 20:08:32 +0000 |
| commit | 5738404fe5b15b22843f21e01b938a6680cee90a (patch) | |
| tree | a151f39d1ba4c2f9b0c6c4e1e54f16e2f437c397 /usr.sbin/ospf6d/ospf6.h | |
| parent | 35eb64bb541de813192e9fb9e814f9dc16a4cba4 (diff) | |
area_ospf_options() should not return network byte order options. Instead
the callers should take care of getting the byte order right. While there
remove the opts[123] from the hello_hdr and use LSA_24_* to handle this
nasty fields instead. Now router LSA have the correct flags set.
Diffstat (limited to 'usr.sbin/ospf6d/ospf6.h')
| -rw-r--r-- | usr.sbin/ospf6d/ospf6.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/ospf6d/ospf6.h b/usr.sbin/ospf6d/ospf6.h index c6f4623953c..c233f6b3af9 100644 --- a/usr.sbin/ospf6d/ospf6.h +++ b/usr.sbin/ospf6d/ospf6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6.h,v 1.9 2008/12/28 18:30:55 claudio Exp $ */ +/* $OpenBSD: ospf6.h,v 1.10 2008/12/28 20:08:31 claudio Exp $ */ /* * Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org> @@ -118,10 +118,7 @@ struct ospf_hdr { /* Hello header (type 1) */ struct hello_hdr { u_int32_t iface_id; - u_int8_t rtr_priority; - u_int8_t opts1; - u_int8_t opts2; - u_int8_t opts3; + u_int32_t opts; /* 8bit rtr_priority + 24bits options */ u_int16_t hello_interval; u_int16_t rtr_dead_interval; u_int32_t d_rtr; |