Merge pull request #5280 from qlyoung/doc-clean-topotest-json

[mirror_frr.git] / isisd / isis_common.h

diff --git a/isisd/isis_common.h b/isisd/isis_common.h
index 2ad4dc4ce6ae47f2fba5522875a05c1bd4d4f6b1..809a3980df75f10f6d97710a1dfd7ff18b03061b 100644 (file)
--- a/isisd/isis_common.h
+++ b/isisd/isis_common.h
@@ -15,10 +15,10 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef ISIS_COMMON_H
@@ -28,40 +28,30 @@
  * Area Address
  */
 struct area_addr {
-       u_char addr_len;
-       u_char area_addr[20];
+       uint8_t addr_len;
+       uint8_t area_addr[20];
 };
 
 struct isis_passwd {
-       u_char len;
+       uint8_t len;
 #define ISIS_PASSWD_TYPE_UNUSED   0
 #define ISIS_PASSWD_TYPE_CLEARTXT 1
 #define ISIS_PASSWD_TYPE_HMAC_MD5 54
 #define ISIS_PASSWD_TYPE_PRIVATE  255
-       u_char type;
+       uint8_t type;
 /* Authenticate SNPs? */
 #define SNP_AUTH_SEND   0x01
 #define SNP_AUTH_RECV   0x02
-       u_char snp_auth;
-       u_char passwd[255];
-};
-
-/*
- * (Dynamic) Hostname
- * one struct for cache list
- * one struct for LSP TLV
- */
-struct hostname {
-       u_char namelen;
-       u_char name[255];
+       uint8_t snp_auth;
+       uint8_t passwd[255];
 };
 
 /*
  * Supported Protocol IDs
  */
 struct nlpids {
-       u_char count;
-       u_char nlpids[4]; /* FIXME: enough ? */
+       uint8_t count;
+       uint8_t nlpids[4]; /* FIXME: enough ? */
 };
 
 #endif