cpp/funstraw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start of channel_bitrates, start combining server and client common code.

Browse Source
This commit is contained in:
Ian Gulliver
2015-02-07 14:32:53 -08:00
parent 2e9d0b7960
commit 844db000f6
6 changed files with 109 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
auth-client.cc
View File

@@ -1,4 +1,5 @@
#include <getopt.h>
#include <stdlib.h>
#include "crypto.h"
@@ -7,6 +8,7 @@ static const struct option long_options[] = {
{"server_public_key_filename", required_argument, NULL, 'r'},
{"server_address", required_argument, NULL, 'a'},
{"server_port", required_argument, NULL, 't'},
{"channel_bitrate", required_argument, NULL, 'b'},
};
int main(int argc, char *argv[]) {
@@ -15,6 +17,7 @@ int main(int argc, char *argv[]) {
std::string server_public_key_filename;
std::string server_address;
std::string server_port;
std::list<uint64_t> channel_bitrates;
{
int option, option_index;
while ((option = getopt_long(argc, argv, "s:", long_options, &option_index)) != -1) {
@@ -34,16 +37,19 @@ int main(int argc, char *argv[]) {
case 't':
server_port = optarg;
break;
case 'b':
channel_bitrates.push_back(strtoull(optarg, NULL, 10));
break;
}
}
}
std::string secret_key;
CryptoBase::ReadKeyFromFile(secret_key_filename, &secret_key);
CryptoUtil::ReadKeyFromFile(secret_key_filename, &secret_key);
std::string server_public_key;
CryptoBase::ReadKeyFromFile(server_public_key_filename, &server_public_key);
CryptoUtil::ReadKeyFromFile(server_public_key_filename, &server_public_key);
auto client = CryptoPubClient::FromHostname(server_address, server_port, secret_key, server_public_key);
auto client = CryptoPubClient::FromHostname(server_address, server_port, secret_key, server_public_key, channel_bitrates);
client->Loop();
}