proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 13:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use ptm msg v2 header format for notifications

Browse Source
This commit is contained in:
Donald Sharp 2015-05-19 18:04:22 -07:00
parent 167d390a20
commit 0a56c84405
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zebra/zebra_ptm.c
View File

@ -32,10 +32,8 @@
#define ZEBRA_PTM_RECONNECT_TIME_INITIAL 1 /* initial reconnect is 1s */ #define ZEBRA_PTM_RECONNECT_TIME_INITIAL 1 /* initial reconnect is 1s */
#define ZEBRA_PTM_RECONNECT_TIME_MAX 300 #define ZEBRA_PTM_RECONNECT_TIME_MAX 300
#define PTM_EOF_LEN 4
#define PTM_MSG_LEN 4 #define PTM_MSG_LEN 4
#define PTM_HEADER_LEN 10 #define PTM_HEADER_LEN 37
char *PTM_EOF_STR = "EOF\n";
char *ZEBRA_PTM_GET_STATUS_CMD = "get-status"; char *ZEBRA_PTM_GET_STATUS_CMD = "get-status";
char *ZEBRA_PTM_PORT_STR = "port"; char *ZEBRA_PTM_PORT_STR = "port";
char *ZEBRA_PTM_CBL_STR = "cbl status"; char *ZEBRA_PTM_CBL_STR = "cbl status";
@ -173,7 +171,7 @@ zebra_ptm_socket_init (void)
zebra_ptm_sock = -1; zebra_ptm_sock = -1;
sock = socket (PF_UNIX, SOCK_STREAM, 0); sock = socket (PF_UNIX, (SOCK_STREAM | SOCK_NONBLOCK), 0);
if (sock < 0) if (sock < 0)
return -1; return -1;
@ -404,21 +402,12 @@ zebra_ptm_sock_read (struct thread *thread)
/* PTM communicates in CSV format */ /* PTM communicates in CSV format */
while(!done) { while(!done) {
rcvptr = eofptr = rcvbuf; rcvptr = rcvbuf;
/* check for EOF */ /* get PTM header */
nbytes = recv(sock, eofptr, PTM_EOF_LEN, 0); nbytes = recv(sock, rcvptr, PTM_HEADER_LEN, 0);
if (nbytes <= 0) if (nbytes <= 0)
break; break;
if (!strncmp(eofptr, PTM_EOF_STR, PTM_EOF_LEN)){ snprintf(msgbuf, PTM_MSG_LEN+1, "%s", rcvptr);
done = TRUE;
continue;
}
/* get rest of PTM header */
nbytes = recv(sock, rcvptr+PTM_EOF_LEN, PTM_HEADER_LEN-PTM_EOF_LEN, 0);
if (nbytes <= 0)
break;
strncpy(msgbuf, rcvptr, PTM_MSG_LEN);
msglen = strtol(msgbuf, NULL, 10); msglen = strtol(msgbuf, NULL, 10);
/* get the PTM message */ /* get the PTM message */
@ -432,8 +421,7 @@ zebra_ptm_sock_read (struct thread *thread)
} }
if (nbytes <= 0) { if (nbytes <= 0) {
if (errno && errno != EWOULDBLOCK && errno != EAGAIN) {
if (nbytes < 0 && errno != EWOULDBLOCK && errno != EAGAIN)
zlog_warn ("routing socket error: %s", safe_strerror (errno)); zlog_warn ("routing socket error: %s", safe_strerror (errno));
close (zebra_ptm_sock); close (zebra_ptm_sock);
@ -441,6 +429,7 @@ zebra_ptm_sock_read (struct thread *thread)
zebra_ptm_thread = thread_add_timer (zebrad.master, zebra_ptm_connect, zebra_ptm_thread = thread_add_timer (zebrad.master, zebra_ptm_connect,
NULL, zebra_ptm_reconnect_time); NULL, zebra_ptm_reconnect_time);
return (-1); return (-1);
}
} }
zebra_ptm_thread = thread_add_read (zebrad.master, zebra_ptm_sock_read, NULL, sock); zebra_ptm_thread = thread_add_read (zebrad.master, zebra_ptm_sock_read, NULL, sock);