diff options
| author | David M. Syzdek <david.syzdek@acsalaska.com> | 2020-02-10 12:54:49 -0900 |
|---|---|---|
| committer | David M. Syzdek <david.syzdek@acsalaska.com> | 2020-02-10 12:54:49 -0900 |
| commit | 693a74cf36fcb7c99c77dae40091ea1717a091d7 (patch) | |
| tree | 3ae6d2172a4229a000fb695af53ac4f169cdc9f7 /src | |
| parent | eb05200e2b62800c583ac5fa12f9fdd1282c5561 (diff) | |
| download | akcom-udpecho-693a74cf36fcb7c99c77dae40091ea1717a091d7.tar.gz akcom-udpecho-693a74cf36fcb7c99c77dae40091ea1717a091d7.tar.bz2 akcom-udpecho-693a74cf36fcb7c99c77dae40091ea1717a091d7.tar.xz akcom-udpecho-693a74cf36fcb7c99c77dae40091ea1717a091d7.zip | |
akcom-udpechod: replacing listen struct member with static variable
Diffstat (limited to 'src')
| -rw-r--r-- | src/akcom-udpechod.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/akcom-udpechod.c b/src/akcom-udpechod.c index 0d031e8..c78e020 100644 --- a/src/akcom-udpechod.c +++ b/src/akcom-udpechod.c | |||
| @@ -148,13 +148,11 @@ static int should_stop = 0; | |||
| 148 | 148 | ||
| 149 | struct app_config | 149 | struct app_config |
| 150 | { | 150 | { |
| 151 | const char * listen; // IP address to listen for requests | ||
| 152 | uid_t uid; // setuid | 151 | uid_t uid; // setuid |
| 153 | gid_t gid; // setgid | 152 | gid_t gid; // setgid |
| 154 | }; | 153 | }; |
| 155 | static struct app_config cnf = | 154 | static struct app_config cnf = |
| 156 | { | 155 | { |
| 157 | .listen = NULL, | ||
| 158 | .uid = 0, | 156 | .uid = 0, |
| 159 | .gid = 0, | 157 | .gid = 0, |
| 160 | }; | 158 | }; |
| @@ -167,6 +165,7 @@ static useconds_t cnf_delay = 0; // Dela | |||
| 167 | static int32_t cnf_verbose = 0; // runtime verbosity | 165 | static int32_t cnf_verbose = 0; // runtime verbosity |
| 168 | static int cnf_facility = LOG_DAEMON; // syslog facility | 166 | static int cnf_facility = LOG_DAEMON; // syslog facility |
| 169 | static int cnf_dont_fork = 0; | 167 | static int cnf_dont_fork = 0; |
| 168 | static const char * cnf_listen = NULL; // IP address to listen for requests | ||
| 170 | 169 | ||
| 171 | 170 | ||
| 172 | ////////////////// | 171 | ////////////////// |
| @@ -322,7 +321,7 @@ int main(int argc, char * argv[]) | |||
| 322 | return(0); | 321 | return(0); |
| 323 | 322 | ||
| 324 | case 'l': | 323 | case 'l': |
| 325 | cnf.listen = optarg; | 324 | cnf_listen = optarg; |
| 326 | break; | 325 | break; |
| 327 | 326 | ||
| 328 | case 'n': | 327 | case 'n': |
| @@ -533,7 +532,7 @@ int my_daemonize(void) | |||
| 533 | 532 | ||
| 534 | // determines interface on which to listen | 533 | // determines interface on which to listen |
| 535 | bzero(&sa, sizeof(sa)); | 534 | bzero(&sa, sizeof(sa)); |
| 536 | if (!(cnf.listen)) | 535 | if (!(cnf_listen)) |
| 537 | { | 536 | { |
| 538 | sa.sin6.sin6_family = AF_INET6; | 537 | sa.sin6.sin6_family = AF_INET6; |
| 539 | sa.sin6.sin6_addr = in6addr_any; | 538 | sa.sin6.sin6_addr = in6addr_any; |
| @@ -541,12 +540,12 @@ int my_daemonize(void) | |||
| 541 | socklen = sizeof(struct sockaddr_in6); | 540 | socklen = sizeof(struct sockaddr_in6); |
| 542 | } else | 541 | } else |
| 543 | { | 542 | { |
| 544 | if ((rc = inet_pton(AF_INET, cnf.listen, &sa.sin.sin_addr)) == 1) | 543 | if ((rc = inet_pton(AF_INET, cnf_listen, &sa.sin.sin_addr)) == 1) |
| 545 | { | 544 | { |
| 546 | sa.sin.sin_family = AF_INET; | 545 | sa.sin.sin_family = AF_INET; |
| 547 | sa.sin.sin_port = htons(cnf_port); | 546 | sa.sin.sin_port = htons(cnf_port); |
| 548 | socklen = sizeof(struct sockaddr_in); | 547 | socklen = sizeof(struct sockaddr_in); |
| 549 | } else if ((rc = inet_pton(AF_INET6, cnf.listen, &sa.sin6.sin6_addr)) == 1) | 548 | } else if ((rc = inet_pton(AF_INET6, cnf_listen, &sa.sin6.sin6_addr)) == 1) |
| 550 | { | 549 | { |
| 551 | sa.sin6.sin6_family = AF_INET6; | 550 | sa.sin6.sin6_family = AF_INET6; |
| 552 | sa.sin6.sin6_port = htons(cnf_port); | 551 | sa.sin6.sin6_port = htons(cnf_port); |
