diff options
Diffstat (limited to 'lib/vty.c')
| -rw-r--r-- | lib/vty.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -160,9 +160,9 @@ int vty_out(struct vty *vty, const char *format, ...) /* Pointer p must point out buffer. */ if (vty->type != VTY_TERM) - buffer_put(vty->obuf, (u_char *)p, len); + buffer_put(vty->obuf, (uint8_t *)p, len); else - buffer_put_crlf(vty->obuf, (u_char *)p, len); + buffer_put_crlf(vty->obuf, (uint8_t *)p, len); /* If p is not different with buf, it is allocated buffer. */ if (p != buf) @@ -731,7 +731,6 @@ static void vty_end_config(struct vty *vty) case ISIS_NODE: case KEYCHAIN_NODE: case KEYCHAIN_KEY_NODE: - case MASC_NODE: case VTY_NODE: case BGP_EVPN_VNI_NODE: vty_config_unlock(vty); @@ -1128,7 +1127,6 @@ static void vty_stop_input(struct vty *vty) case ISIS_NODE: case KEYCHAIN_NODE: case KEYCHAIN_KEY_NODE: - case MASC_NODE: case VTY_NODE: vty_config_unlock(vty); vty->node = ENABLE_NODE; @@ -1243,12 +1241,12 @@ static int vty_telnet_option(struct vty *vty, unsigned char *buf, int nbytes) "RFC 1073 violation detected: telnet NAWS option " "should send %d characters, but we received %lu", TELNET_NAWS_SB_LEN, - (u_long)vty->sb_len); + (unsigned long)vty->sb_len); else if (sizeof(vty->sb_buf) < TELNET_NAWS_SB_LEN) zlog_err( "Bug detected: sizeof(vty->sb_buf) %lu < %d, " "too small to handle the telnet NAWS option", - (u_long)sizeof(vty->sb_buf), + (unsigned long)sizeof(vty->sb_buf), TELNET_NAWS_SB_LEN); else { vty->width = ((vty->sb_buf[1] << 8) @@ -2057,7 +2055,7 @@ static int vtysh_read(struct thread *thread) struct vty *vty; unsigned char buf[VTY_READ_BUFSIZ]; unsigned char *p; - u_char header[4] = {0, 0, 0, 0}; + uint8_t header[4] = {0, 0, 0, 0}; sock = THREAD_FD(thread); vty = THREAD_ARG(thread); |