Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d9449c8

Browse files
BriasBrias
committed
rtrlib: Fix merge conflicts with master branch
2 parents 1f84fda + f3d1cfa commit d9449c8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1996
-1919
lines changed

‎doxygen/examples/rtr_mgr.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ int main()
3434
char ssh_user[] = "rpki_user";
3535
char ssh_hostkey[] = "/etc/rpki-rtr/hostkey";
3636
char ssh_privkey[] = "/etc/rpki-rtr/client.priv";
37-
struct tr_socket tr_ssh;
38-
struct tr_ssh_config config = {
37+
struct rtr_tr_socket tr_ssh;
38+
struct rtr_tr_ssh_config config = {
3939
ssh_host, //IP
4040
22, //Port
4141
NULL, //Source address
@@ -47,22 +47,22 @@ int main()
4747
0, // connect timeout
4848
NULL, // password
4949
};
50-
tr_ssh_init(&config, &tr_ssh);
50+
rtr_tr_ssh_init(&config, &tr_ssh);
5151

5252
//create a TCP transport socket
53-
struct tr_socket tr_tcp;
53+
struct rtr_tr_socket tr_tcp;
5454
char tcp_host[] = "rpki-validator.realmv6.org";
5555
char tcp_port[] = "8282";
5656

57-
struct tr_tcp_config tcp_config = {
57+
struct rtr_tr_tcp_config tcp_config = {
5858
tcp_host, //IP
5959
tcp_port, //Port
6060
NULL, //Source address
6161
NULL, //data
6262
NULL, //get_socket()
6363
0, // connect timeout
6464
};
65-
tr_tcp_init(&tcp_config, &tr_tcp);
65+
rtr_tr_tcp_init(&tcp_config, &tr_tcp);
6666

6767
//create 3 rtr_sockets and associate them with the transprort sockets
6868
struct rtr_socket rtr_ssh, rtr_tcp;
@@ -99,26 +99,26 @@ int main()
9999
}
100100

101101
//validate the BGP-Route 10.10.0.0/24, origin ASN: 12345
102-
struct lrtr_ip_addr pref;
103-
lrtr_ip_str_to_addr("10.10.0.0", &pref);
104-
enum pfxv_state result;
102+
struct rtr_ip_addr pref;
103+
rtr_ip_str_to_addr("10.10.0.0", &pref);
104+
enum rtr_pfxv_state result;
105105
const uint8_t mask = 24;
106-
rtr_mgr_validate(conf, 12345, &pref, mask, &result);
106+
rtr_mgr_roa_validate(conf, 12345, &pref, mask, &result);
107107

108108
//output the result of the prefix validation above
109109
//to showcase the returned states.
110110
char buffer[INET_ADDRSTRLEN];
111-
lrtr_ip_addr_to_str(&pref, buffer, sizeof(buffer));
111+
rtr_ip_addr_to_str(&pref, buffer, sizeof(buffer));
112112

113113
printf("RESULT: The prefix %s/%i ", buffer, mask);
114114
switch (result) {
115-
case BGP_PFXV_STATE_VALID:
115+
case RTR_BGP_PFXV_STATE_VALID:
116116
printf("is valid.\n");
117117
break;
118-
case BGP_PFXV_STATE_INVALID:
118+
case RTR_BGP_PFXV_STATE_INVALID:
119119
printf("is invalid.\n");
120120
break;
121-
case BGP_PFXV_STATE_NOT_FOUND:
121+
case RTR_BGP_PFXV_STATE_NOT_FOUND:
122122
printf("was not found.\n");
123123
break;
124124
default:

‎doxygen/examples/ssh_tr.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
int main()
66
{
7-
struct tr_socket ssh_socket;
7+
struct rtr_tr_socket ssh_socket;
88
char ssh_host[] = "123.231.123.221";
99
char ssh_user[] = "rpki_user";
1010
char ssh_hostkey[] = "/etc/rpki-rtr/hostkey";
1111
char ssh_privkey[] = "/etc/rpki-rtr/client.priv";
1212

13-
struct tr_ssh_config config = {
13+
struct rtr_tr_ssh_config config = {
1414
ssh_host, 22, NULL, ssh_user, ssh_hostkey, ssh_privkey, NULL, NULL, 0, NULL
1515
};
1616

17-
tr_ssh_init(&config, &ssh_socket);
17+
rtr_tr_ssh_init(&config, &ssh_socket);
1818
}

0 commit comments

Comments
 (0)