diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2017-01-12 14:58:49 +0100 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2017-01-12 14:58:49 +0100 |
| commit | 4e3c360377bc9b792c2fac83e9402d7531f79bbe (patch) | |
| tree | e4409fb32ed7c391f48c3c2699997fc5b75137a1 /src/ipcpd/shim-eth-llc/main.c | |
| parent | 7cad036f812a87aafd7c0e8ed4cbea76fb4cb097 (diff) | |
| parent | 15e9b779385c71d366776b83540e19e0735c4e66 (diff) | |
| download | ouroboros-4e3c360377bc9b792c2fac83e9402d7531f79bbe.tar.gz ouroboros-4e3c360377bc9b792c2fac83e9402d7531f79bbe.zip | |
Merged in sandervrijders/ouroboros/be-gam (pull request #345)
Be gam
Diffstat (limited to 'src/ipcpd/shim-eth-llc/main.c')
| -rw-r--r-- | src/ipcpd/shim-eth-llc/main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c index 0ff8007b..da496b07 100644 --- a/src/ipcpd/shim-eth-llc/main.c +++ b/src/ipcpd/shim-eth-llc/main.c @@ -77,9 +77,6 @@ typedef ShimEthLlcMsg shim_eth_llc_msg_t; #define EVENT_WAIT_TIMEOUT 100 /* us */ #define NAME_QUERY_TIMEOUT 100000000 /* ns */ -/* global for trapping signal */ -int irmd_api; - struct eth_llc_frame { uint8_t dst_hwaddr[MAC_SIZE]; uint8_t src_hwaddr[MAC_SIZE]; @@ -675,7 +672,7 @@ void ipcp_sig_handler(int sig, siginfo_t * info, void * c) case SIGINT: case SIGTERM: case SIGHUP: - if (info->si_pid == irmd_api) { + if (info->si_pid == ipcpi.irmd_api) { pthread_rwlock_wrlock(&ipcpi.state_lock); if (ipcp_get_state() == IPCP_INIT) @@ -1123,9 +1120,6 @@ int main(int argc, char * argv[]) exit(EXIT_FAILURE); } - /* store the process id of the irmd */ - irmd_api = atoi(argv[1]); - /* init sig_act */ memset(&sig_act, 0, sizeof(sig_act)); |