--- embedaddon/mpd/src/iface.c 2021/03/17 00:39:23 1.1.1.5 +++ embedaddon/mpd/src/iface.c 2023/09/27 11:08:00 1.1.1.5.2.1 @@ -64,6 +64,10 @@ #include +#ifdef SIOCSIFDESCR +#include +#endif + /* * DEFINITIONS */ @@ -1110,7 +1114,10 @@ IfaceIpIfaceUp(Bund b, int ready) u_addrtoa(&iface->peer_addr, peerbuf, sizeof(peerbuf)), *b->params.authname ? b->params.authname : "-", ns1buf, ns2buf, *b->params.peeraddr ? b->params.peeraddr : "-", - b->params.filter_id ? b->params.filter_id : "-"); +#ifdef USE_RADIUS + b->params.filter_id ? b->params.filter_id : +#endif + "-"); if (res != 0) { FsmFailure(&b->ipcp.fsm, FAIL_NEGOT_FAILURE); return (-1); @@ -1142,7 +1149,10 @@ IfaceIpIfaceDown(Bund b) u_addrtoa(&iface->peer_addr, peerbuf, sizeof(peerbuf)), *b->params.authname ? b->params.authname : "-", *b->params.peeraddr ? b->params.peeraddr : "-", - b->params.filter_id ? b->params.filter_id : "-"); +#ifdef USE_RADIUS + b->params.filter_id ? b->params.filter_id : +#endif + "-"); } /* Delete dynamic routes */ @@ -1254,7 +1264,10 @@ IfaceIpv6IfaceUp(Bund b, int ready) u_addrtoa(&iface->peer_ipv6_addr, peerbuf, sizeof(peerbuf)), iface->ifname, *b->params.authname ? b->params.authname : "-", *b->params.peeraddr ? b->params.peeraddr : "-", - b->params.filter_id ? b->params.filter_id : "-"); +#ifdef USE_RADIUS + b->params.filter_id ? b->params.filter_id : +#endif + "-"); if (res != 0) { FsmFailure(&b->ipv6cp.fsm, FAIL_NEGOT_FAILURE); return (-1); @@ -1287,7 +1300,10 @@ IfaceIpv6IfaceDown(Bund b) u_addrtoa(&iface->peer_ipv6_addr, peerbuf, sizeof(peerbuf)), iface->ifname, *b->params.authname ? b->params.authname : "-", *b->params.peeraddr ? b->params.peeraddr : "-", - b->params.filter_id ? b->params.filter_id : "-"); +#ifdef USE_RADIUS + b->params.filter_id ? b->params.filter_id : +#endif + "-"); } /* Delete dynamic routes */ @@ -3812,6 +3828,7 @@ IfaceSetName(Bund b, const char * ifname) * %o for local outer ("physical") address of bundle's first link * %O for peer outer ("physical") address of bundle's first link * %P for peer outer ("physical") port of bundle's first link + * %s for last interface description change time, in unixtime (seconds) * %S for interface status (DoD/UP/DOWN) * %t for type of bundle's first link (pppoe, pptp, l2tp etc.) * %u for self auth name (or dash if self auth name not used) @@ -3971,6 +3988,11 @@ IfaceSetDescr(Bund b, const char * template) } else { DST_COPY("-"); } + break; + /* timestamp of interface description change */ + case 's': + snprintf(buf, sizeof(buf), "%jd", (intmax_t)time(NULL)); + DST_COPY(buf); break; /* interface status */ case 'S':