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

LibSSH may be switched off together with RPKI

Browse Source
This commit is contained in:
Jan Moskyto Matejka
2016-12-07 14:15:35 +01:00
parent cdbe1defa4
commit af62c0f9f1
11 changed files with 45 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proto/rpki/packets.c
View File

@@ -1019,7 +1019,7 @@ rpki_send_error_pdu(struct rpki_cache *cache, const enum pdu_error_type error_co
u32 pdu_size = 16 + err_pdu_len + msg_len;
byte pdu[pdu_size];
memset(pdu, sizeof(pdu), 0);
memset(pdu, 0, sizeof(pdu));
struct pdu_error *e = (void *) pdu;
e->ver = cache->version;

2
proto/rpki/rpki.c
View File

@@ -887,7 +887,7 @@ rpki_check_config(struct rpki_config *cf)
/* Set default port numbers */
switch (cf->tr_config.type)
{
case RPKI_SSH_PORT:
case RPKI_TR_SSH:
cf->port = RPKI_SSH_PORT;
break;
default:

8
proto/rpki/ssh_transport.c
View File

@@ -16,7 +16,6 @@
#include <sys/time.h>
#include "rpki.h"
#include "lib/libssh.h"
static int
rpki_tr_ssh_open(struct rpki_tr_sock *tr)
@@ -26,13 +25,6 @@ rpki_tr_ssh_open(struct rpki_tr_sock *tr)
struct rpki_tr_ssh_config *ssh_cf = (void *) cf->tr_config.spec;
sock *sk = tr->sk;
const char *err_msg;
if ((err_msg = load_libssh()) != NULL)
{
CACHE_TRACE(D_EVENTS, cache, "%s", err_msg);
return RPKI_TR_ERROR;
}
sk->type = SK_SSH_ACTIVE;
sk->ssh = mb_allocz(sk->pool, sizeof(struct ssh_sock));
sk->ssh->username = ssh_cf->user;