Merge pull request #3394 from karamalla0406/frr3360

[mirror_frr.git] / bgpd / bgp_btoa.c

diff --git a/bgpd/bgp_btoa.c b/bgpd/bgp_btoa.c
index 4faebb538e8807711d24ab78476d5061f055322d..cc37e352ef9a96e536194fc224fbbefbacbb7dcd 100644 (file)
--- a/bgpd/bgp_btoa.c
+++ b/bgpd/bgp_btoa.c
@@ -68,12 +68,12 @@ enum MRT_MSG_TYPES {
        MSG_TABLE_DUMP            /* routing table dump */
 };
 
-static int attr_parse(struct stream *s, u_int16_t len)
+static int attr_parse(struct stream *s, uint16_t len)
 {
-       u_int flag;
-       u_int type;
-       u_int16_t length;
-       u_int16_t lim;
+       unsigned int flag;
+       unsigned int type;
+       uint16_t length;
+       uint16_t lim;
 
        lim = s->getp + len;
 
@@ -94,7 +94,7 @@ static int attr_parse(struct stream *s, u_int16_t len)
 
                switch (type) {
                case BGP_ATTR_ORIGIN: {
-                       u_char origin;
+                       uint8_t origin;
                        origin = stream_getc(s);
                        printf("ORIGIN: %d\n", origin);
                } break;
@@ -122,7 +122,7 @@ static int attr_parse(struct stream *s, u_int16_t len)
 int main(int argc, char **argv)
 {
        int ret;
-       FILE *fp;
+       int fd;
        struct stream *s;
        time_t now;
        int type;
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
        int family;
        struct in_addr sip;
        struct in_addr dip;
-       u_int16_t viewno, seq_num;
+       uint16_t viewno, seq_num;
        struct prefix_ipv4 p;
 
        s = stream_new(10000);
@@ -143,8 +143,8 @@ int main(int argc, char **argv)
                fprintf(stderr, "Usage: %s FILENAME\n", argv[0]);
                exit(1);
        }
-       fp = fopen(argv[1], "r");
-       if (!fp) {
+       fd = open(argv[1], O_RDONLY);
+       if (fd < 0) {
                fprintf(stdout,
                        "%% Can't open configuration file %s due to '%s'.\n",
                        argv[1], safe_strerror(errno));
@@ -154,13 +154,14 @@ int main(int argc, char **argv)
        while (1) {
                stream_reset(s);
 
-               ret = fread(s->data, 12, 1, fp);
-               if (!ret || feof(fp)) {
-                       printf("END OF FILE\n");
-                       break;
-               }
-               if (ferror(fp)) {
-                       printf("ERROR OF FREAD\n");
+               ret = stream_read(s, fd, 12);
+               if (ret != 12) {
+                       if (!ret)
+                               printf("END OF FILE\n");
+                       else if (ret < 0)
+                               printf("ERROR OF READ\n");
+                       else
+                               printf("UNDERFLOW\n");
                        break;
                }
 
@@ -217,23 +218,24 @@ int main(int argc, char **argv)
 
                printf("len: %zd\n", len);
 
-               fread(s->data + 12, len, 1, fp);
-               if (feof(fp)) {
-                       printf("ENDOF FILE 2\n");
-                       break;
-               }
-               if (ferror(fp)) {
-                       printf("ERROR OF FREAD 2\n");
+               ret = stream_read(s, fd, len);
+               if (ret != (int)len) {
+                       if (!ret)
+                               printf("END OF FILE 2\n");
+                       else if (ret < 0)
+                               printf("ERROR OF READ 2\n");
+                       else
+                               printf("UNDERFLOW 2\n");
                        break;
                }
 
                /* printf ("now read %d\n", len); */
 
                if (type == MSG_TABLE_DUMP) {
-                       u_char status;
+                       uint8_t status;
                        time_t originated;
                        struct in_addr peer;
-                       u_int16_t attrlen;
+                       uint16_t attrlen;
 
                        viewno = stream_getw(s);
                        seq_num = stream_getw(s);
@@ -284,6 +286,6 @@ int main(int argc, char **argv)
                        printf("\n");
                }
        }
-       fclose(fp);
+       close(fd);
        return 0;
 }