Skip to content

Remove GCC-isms #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tbaederr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove GCC-isms #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c69274f
Remove GNU old-style field designators
tbaederr Nov 17, 2020
e08d346
Pull created_verbose() into file scope
tbaederr Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions authd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ static request_t created_request(int argc, char *argv[]) {

static char *created_hostname(const char *node) {
char *s;
struct addrinfo *res, hints = { ai_flags: AI_CANONNAME };
struct addrinfo *res, hints = { .ai_flags = AI_CANONNAME };

assert(node != NULL && *node != '\0');
if (opt.resolve && getaddrinfo(node, NULL, &hints, &res) == 0) {
Expand Down Expand Up @@ -620,6 +620,25 @@ typedef struct {
static const size_t USERID_MAX_LEN = 512; // as per RFC1413 <octet-string>
static const char *const TEXT_READ_MODE = "r"; // passphrase, /proc plaintext


static char *created_verbose(const char *name, unsigned long id,
const char *laddr, unsigned long lport,
const char *raddr, unsigned long rport) {
size_t n; time_t tod;
char *s, when[USERID_MAX_LEN], *host1, *port1, *host2, *port2;
const char *const UTC_FMT = "%FT%TZ", *const TZ_FMT = "(%a %EX %z/%Z)";
const char *const VERBOSE_FMT = "%s:%lu,%s,%s|%s,%s|%s";

if (time(&tod) == (time_t) -1) handle_error(NULL);
n = strftime(when, sizeof(when), UTC_FMT, gmtime(&tod));
strftime(when + n, sizeof(when) - n, TZ_FMT, localtime(&tod));
host1 = created_hostname(laddr); port1 = created_servicename(lport);
host2 = created_hostname(raddr); port2 = created_servicename(rport);
asprintf(&s, VERBOSE_FMT, name, id, when, host1, port1, host2, port2);
free(host1); free(port1); free(host2); free(port2);
return s;
}

static bool get_info(reply_t *out, request_t in, const char *tcpname) {
//unsigned long lport, rport, uid, status; FILE *stream;
unsigned long lport, rport, status; FILE *stream;
Expand All @@ -629,22 +648,6 @@ static bool get_info(reply_t *out, request_t in, const char *tcpname) {
char *laddr = NULL, *raddr = NULL;
bool is_port_pair_found = false;

char *created_verbose(const char *name, unsigned long id) {
size_t n; time_t tod;
char *s, when[USERID_MAX_LEN], *host1, *port1, *host2, *port2;
const char *const UTC_FMT = "%FT%TZ", *const TZ_FMT = "(%a %EX %z/%Z)";
const char *const VERBOSE_FMT = "%s:%lu,%s,%s|%s,%s|%s";

if (time(&tod) == (time_t) -1) handle_error(NULL);
n = strftime(when, sizeof(when), UTC_FMT, gmtime(&tod));
strftime(when + n, sizeof(when) - n, TZ_FMT, localtime(&tod));
host1 = created_hostname(laddr); port1 = created_servicename(lport);
host2 = created_hostname(raddr); port2 = created_servicename(rport);
asprintf(&s, VERBOSE_FMT, name, id, when, host1, port1, host2, port2);
free(host1); free(port1); free(host2); free(port2);
return s;
}

assert(out != NULL);
if (tcpname == NULL) return false;
if ((stream = fopen(tcpname, TEXT_READ_MODE)) == NULL) {
Expand Down Expand Up @@ -779,7 +782,7 @@ static bool get_info(reply_t *out, request_t in, const char *tcpname) {
if (opt.verbose && !out->error) {
char *brief = out->s;

if ((out->s = created_verbose(brief, uid)) == NULL)
if ((out->s = created_verbose(brief, uid, laddr, lport, raddr, rport)) == NULL)
out->error = true;
else free(brief);
}
Expand Down Expand Up @@ -863,7 +866,7 @@ static char *created_ciphertext_b64(const char *s) {
BIO *encoder; char *b64;
const char *const MAGIC = "Salted__"; // openssl compat: enc -salt
const char *const NL = "\n"; // is strcat()ed to plaintext
crypto_t x = { cipher: NULL };
crypto_t x = { .cipher = NULL };

assert(s != NULL);
OpenSSL_add_all_ciphers();
Expand Down Expand Up @@ -908,7 +911,7 @@ static char *created_ciphertext_b64(const char *s) {
}

static reply_t created_reply(request_t in) {
reply_t out = { lport: 0, rport: 0 };
reply_t out = { .lport = 0, .rport = 0 };
bool is_invalid_port = false;
unsigned attempts = 0;

Expand Down