diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2014-05-12 13:50:15 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2014-05-12 13:50:15 +0400 |
| commit | 0c0bdd363b63319c7484f5cfbe6dd74a15b884be (patch) | |
| tree | 1e5e4f596347cd80a57af5ca68b37eb27fcd91d5 /accel-pppd/ctrl/ipoe | |
| parent | 7466e7f10fb4813a6112682dff13de5fbdd981a7 (diff) | |
| download | accel-ppp-0c0bdd363b63319c7484f5cfbe6dd74a15b884be.tar.gz accel-ppp-0c0bdd363b63319c7484f5cfbe6dd74a15b884be.zip | |
triton: improved epoll events handling
Diffstat (limited to 'accel-pppd/ctrl/ipoe')
| -rw-r--r-- | accel-pppd/ctrl/ipoe/arp.c | 3 | ||||
| -rw-r--r-- | accel-pppd/ctrl/ipoe/dhcpv4.c | 6 | ||||
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe_netlink.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/accel-pppd/ctrl/ipoe/arp.c b/accel-pppd/ctrl/ipoe/arp.c index ee4ccde..e019d88 100644 --- a/accel-pppd/ctrl/ipoe/arp.c +++ b/accel-pppd/ctrl/ipoe/arp.c @@ -183,8 +183,7 @@ struct arp_serv *arpd_start(struct ipoe_serv *ipoe) void arpd_stop(struct arp_serv *arp) { - triton_md_unregister_handler(&arp->h); - close(arp->h.fd); + triton_md_unregister_handler(&arp->h, 1); _free(arp); } diff --git a/accel-pppd/ctrl/ipoe/dhcpv4.c b/accel-pppd/ctrl/ipoe/dhcpv4.c index c603c5f..35fc468 100644 --- a/accel-pppd/ctrl/ipoe/dhcpv4.c +++ b/accel-pppd/ctrl/ipoe/dhcpv4.c @@ -229,8 +229,7 @@ out_err: void dhcpv4_free(struct dhcpv4_serv *serv) { - triton_md_unregister_handler(&serv->hnd); - close(serv->hnd.fd); + triton_md_unregister_handler(&serv->hnd, 1); if (serv->range) _free(serv->range); _free(serv); @@ -911,8 +910,7 @@ out_err_unlock: static void __dhcpv4_relay_free(struct dhcpv4_relay *r) { - triton_md_unregister_handler(&r->hnd); - close(r->hnd.fd); + triton_md_unregister_handler(&r->hnd, 1); triton_context_unregister(&r->ctx); _free(r); } diff --git a/accel-pppd/ctrl/ipoe/ipoe_netlink.c b/accel-pppd/ctrl/ipoe/ipoe_netlink.c index 68e533c..e4d1d02 100644 --- a/accel-pppd/ctrl/ipoe/ipoe_netlink.c +++ b/accel-pppd/ctrl/ipoe/ipoe_netlink.c @@ -638,7 +638,7 @@ static int ipoe_mc_read(struct triton_md_handler_t *h) static void ipoe_mc_close(struct triton_context_t *ctx) { - triton_md_unregister_handler(&mc_hnd); + triton_md_unregister_handler(&mc_hnd, 0); triton_context_unregister(ctx); } |