Deleted Added
full compact
mibII.c (154184) mibII.c (155506)
1/*
2 * Copyright (c) 2001-2003
3 * Fraunhofer Institute for Open Communication Systems (FhG Fokus).
4 * All rights reserved.
5 *
6 * Author: Harti Brandt <harti@freebsd.org>
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 292 unchanged lines hidden (view full) ---

301 len = sizeof(ifp->mib);
302 if (sysctl(name, 6, &ifp->mib, &len, NULL, 0) == -1) {
303 if (errno != ENOENT)
304 syslog(LOG_WARNING, "sysctl(ifmib, %s) failed %m",
305 ifp->name);
306 return (-1);
307 }
308
1/*
2 * Copyright (c) 2001-2003
3 * Fraunhofer Institute for Open Communication Systems (FhG Fokus).
4 * All rights reserved.
5 *
6 * Author: Harti Brandt <harti@freebsd.org>
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 292 unchanged lines hidden (view full) ---

301 len = sizeof(ifp->mib);
302 if (sysctl(name, 6, &ifp->mib, &len, NULL, 0) == -1) {
303 if (errno != ENOENT)
304 syslog(LOG_WARNING, "sysctl(ifmib, %s) failed %m",
305 ifp->name);
306 return (-1);
307 }
308
309 if (ifp->trap_enable) {
310 if (!(oldmib.ifmd_flags & IFF_UP)) {
311 if (ifp->mib.ifmd_flags & IFF_UP)
312 link_trap(ifp, 1);
313 } else {
314 if (!(ifp->mib.ifmd_flags & IFF_UP))
315 link_trap(ifp, 0);
316 }
317 }
309 /*
310 * Quoting RFC2863, 3.1.15: "... LinkUp and linkDown traps are
311 * generated just after ifOperStatus leaves, or just before it
312 * enters, the down state, respectively;"
313 */
314 if (ifp->trap_enable && ifp->mib.ifmd_data.ifi_link_state !=
315 oldmib.ifmd_data.ifi_link_state &&
316 (ifp->mib.ifmd_data.ifi_link_state == LINK_STATE_DOWN ||
317 oldmib.ifmd_data.ifi_link_state == LINK_STATE_DOWN))
318 link_trap(ifp, ifp->mib.ifmd_data.ifi_link_state ==
319 LINK_STATE_UP ? 1 : 0);
318
319 ifp->flags &= ~(MIBIF_HIGHSPEED | MIBIF_VERYHIGHSPEED);
320 if (ifp->mib.ifmd_data.ifi_baudrate > 20000000) {
321 ifp->flags |= MIBIF_HIGHSPEED;
322 if (ifp->mib.ifmd_data.ifi_baudrate > 650000000)
323 ifp->flags |= MIBIF_VERYHIGHSPEED;
324 }
325

--- 294 unchanged lines hidden (view full) ---

620 strcpy(map->name, ifp->name);
621 map->mibif = ifp;
622 STAILQ_INSERT_TAIL(&mibindexmap_list, map, link);
623 } else {
624 /* re-instantiate. Introduce a counter discontinuity */
625 ifp->counter_disc = get_ticks();
626 }
627 ifp->index = map->ifindex;
320
321 ifp->flags &= ~(MIBIF_HIGHSPEED | MIBIF_VERYHIGHSPEED);
322 if (ifp->mib.ifmd_data.ifi_baudrate > 20000000) {
323 ifp->flags |= MIBIF_HIGHSPEED;
324 if (ifp->mib.ifmd_data.ifi_baudrate > 650000000)
325 ifp->flags |= MIBIF_VERYHIGHSPEED;
326 }
327

--- 294 unchanged lines hidden (view full) ---

622 strcpy(map->name, ifp->name);
623 map->mibif = ifp;
624 STAILQ_INSERT_TAIL(&mibindexmap_list, map, link);
625 } else {
626 /* re-instantiate. Introduce a counter discontinuity */
627 ifp->counter_disc = get_ticks();
628 }
629 ifp->index = map->ifindex;
630 ifp->mib.ifmd_data.ifi_link_state = LINK_STATE_UNKNOWN;
628
629 INSERT_OBJECT_INT(ifp, &mibif_list);
630 mib_if_number++;
631 mib_iftable_last_change = this_tick;
632
633 /* instantiate default ifStack entries */
634 (void)mib_ifstack_create(ifp, NULL);
635 (void)mib_ifstack_create(NULL, ifp);

--- 1004 unchanged lines hidden ---
631
632 INSERT_OBJECT_INT(ifp, &mibif_list);
633 mib_if_number++;
634 mib_iftable_last_change = this_tick;
635
636 /* instantiate default ifStack entries */
637 (void)mib_ifstack_create(ifp, NULL);
638 (void)mib_ifstack_create(NULL, ifp);

--- 1004 unchanged lines hidden ---