fix with gcc and use default c++ compiler

pull/1/head
Jeff Becker 6 years ago
parent b2a9605745
commit 4929bf0da8
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -9,7 +9,7 @@ clean: build.ninja
ninja clean
build.ninja:
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug
compile: build.ninja
ninja

@ -133,7 +133,9 @@ extern "C" {
bool
llarp_ai_bdecode(struct llarp_ai *ai, llarp_buffer_t *buff)
{
struct dict_reader reader = {.user = ai, .on_key = &llarp_ai_decode_key};
struct dict_reader reader;
reader.user = ai;
reader.on_key = &llarp_ai_decode_key;
return bdecode_read_dict(buff, &reader);
}
@ -186,8 +188,9 @@ llarp_ai_list_bencode(struct llarp_ai_list *l, llarp_buffer_t *buff)
{
if(!bencode_start_list(buff))
return false;
struct llarp_ai_list_iter ai_itr = {.user = buff,
.visit = &llarp_ai_list_iter_bencode};
struct llarp_ai_list_iter ai_itr;
ai_itr.user = buff;
ai_itr.visit = &llarp_ai_list_iter_bencode;
llarp_ai_list_iterate(l, &ai_itr);
return bencode_end(buff);
}
@ -247,7 +250,9 @@ llarp_ai_list_index(struct llarp_ai_list *l, ssize_t idx, struct llarp_ai *dst)
bool
llarp_ai_list_bdecode(struct llarp_ai_list *l, llarp_buffer_t *buff)
{
struct list_reader r = {.user = l, .on_item = &llarp_ai_list_bdecode_item};
struct list_reader r;
r.user = l;
r.on_item = &llarp_ai_list_bdecode_item;
return bdecode_read_list(buff, &r);
}
}

@ -714,8 +714,6 @@ namespace iwp
introduce(uint8_t *pub)
{
memcpy(remote, pub, 32);
printf("remote introduce to transport key\n");
llarp::dumphex< llarp_pubkey_t >(remote);
intro.buf = workbuf;
size_t w0sz = (rand() % 32);
intro.sz = (32 * 3) + w0sz;
@ -732,8 +730,6 @@ namespace iwp
intro.remote_pubkey = remote;
// randomize nonce
crypto->randbytes(intro.nonce, 32);
printf("N\n");
llarp::dumphex< llarp_sharedkey_t >(intro.nonce);
// async generate intro packet
intro.user = this;
intro.hook = &handle_generated_intro;

@ -143,7 +143,7 @@ namespace llarp
default:
return;
}
memcpy(ptr, src, slen);
memcpy(dst, src, slen);
*ptr = htons(port());
other->sa_family = af();
}

Loading…
Cancel
Save