1
0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00

BMP: Integrate bmp_conn to bmp_proto

There is only one socket per BMP instance, no need to have separate
struct (like in BGP).
This commit is contained in:
Ondrej Zajicek (work)
2021-03-28 16:41:53 +02:00
committed by Ondrej Zajicek
parent 4adebdf198
commit 568fd66613
2 changed files with 29 additions and 45 deletions

View File

@@ -46,12 +46,6 @@ struct bmp_config {
struct bgp_proto;
struct bmp_proto;
struct bmp_conn {
struct bmp_proto *bmp;
struct birdsock *sk;
event *tx_ev;
};
// Stores sent and received BGP OPEN MSGs
struct bmp_peer_open_msg {
struct bmp_peer_map tx_msg;
@@ -70,7 +64,8 @@ struct rt_table_info {
struct bmp_proto {
struct proto p; // Parent proto
const struct bmp_config *cf; // Shortcut to BMP configuration
struct bmp_conn *conn; // Connection we have established
sock *sk; // TCP connection
event *tx_ev; // TX event
char sys_descr[MIB_II_STR_LEN]; // sysDescr MIB-II [RFC1213] object
char sys_name[MIB_II_STR_LEN]; // sysName MIB-II [RFC1213] object
ip_addr station_ip; // Monitoring station IP address