Skip to content

W
White Rabbit Switch - Software
Commit c234bd4e authored by Jean-Claude BAU's avatar Jean-Claude BAU
Browse files
Options

SNMP: wrsPtpMode & wrsPortStatusPeer are now obsolete

parent a4d60b3f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 12 deletions
userspace/snmpd/WR-SWITCH-MIB.txt
View file @ c234bd4e
......@@ -2005,7 +2005,7 @@ wrsPtpMode OBJECT-TYPE
slave(3)
}
MAX-ACCESS read-only
STATUS current
STATUS obsolete
DESCRIPTION
"The mode of this clock"
::= { wrsPtpDataEntry 5 }
......@@ -2279,7 +2279,7 @@ wrsPortStatusLocked OBJECT-TYPE
wrsPortStatusPeer OBJECT-TYPE
SYNTAX OCTET STRING (SIZE(8))
MAX-ACCESS read-only
STATUS current
STATUS obsolete
DESCRIPTION
"the ClockID of the peer, if available. Or 0"
::= { wrsPortStatusEntry 6 }
......
userspace/snmpd/wrsPortStatusTable.c
View file @ c234bd4e
......@@ -14,7 +14,7 @@ static struct pickinfo wrsPortStatusTable_pickinfo[] = {
FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusLink),
FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusConfiguredMode),
FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusLocked),
FIELD(wrsPortStatusTable_s, ASN_OCTET_STR, wrsPortStatusPeer),
FIELD(wrsPortStatusTable_s, ASN_OCTET_STR, wrsPortStatusPeer_obsolete),
FIELD(wrsPortStatusTable_s, ASN_OCTET_STR, wrsPortStatusSfpVN),
FIELD(wrsPortStatusTable_s, ASN_OCTET_STR, wrsPortStatusSfpPN),
FIELD(wrsPortStatusTable_s, ASN_OCTET_STR, wrsPortStatusSfpVS),
......@@ -113,9 +113,6 @@ time_t wrsPortStatusTable_data_fill(unsigned int *n_rows)
/* Keep value 0 for Not available */
wrsPortStatusTable->wrsPortStatusLocked =
1 + port_state->locked;
/* FIXME: get real peer_id */
memset(&wrsPortStatusTable->wrsPortStatusPeer, 0xff,
sizeof(ClockIdentity));
if (port_state->sfpPresent && (port_state->calib.sfp.flags & SFP_FLAG_IN_DB)) {
wrsPortStatusTable->wrsPortStatusSfpInDB =
WRS_PORT_STATUS_SFP_IN_DB_IN_DATA_BASE;
......
userspace/snmpd/wrsPortStatusTable.h
View file @ c234bd4e
......@@ -36,7 +36,7 @@ struct wrsPortStatusTable_s {
* as not-accessible in MIB */
char wrsPortStatusPortName[12]; /* port name */
int wrsPortStatusConfiguredMode;
ClockIdentity wrsPortStatusPeer;
ClockIdentity wrsPortStatusPeer_obsolete;
/* These can't be "unsigned char" because we scanf a %i in there */
unsigned wrsPortStatusLink;
unsigned wrsPortStatusLocked;
......
userspace/snmpd/wrsPtpDataTable.c
View file @ c234bd4e
......@@ -10,7 +10,7 @@ static struct pickinfo wrsPtpDataTable_pickinfo[] = {
FIELD(wrsPtpDataTable_s, ASN_OCTET_STR, wrsPtpPortName),
FIELD(wrsPtpDataTable_s, ASN_OCTET_STR, wrsPtpGrandmasterID),
FIELD(wrsPtpDataTable_s, ASN_OCTET_STR, wrsPtpOwnID),
FIELD(wrsPtpDataTable_s, ASN_INTEGER, wrsPtpMode),
FIELD(wrsPtpDataTable_s, ASN_INTEGER, wrsPtpMode_obsolete),/* obsolete */
FIELD(wrsPtpDataTable_s, ASN_OCTET_STR, wrsPtpServoState),
FIELD(wrsPtpDataTable_s, ASN_INTEGER, wrsPtpServoStateN),
FIELD(wrsPtpDataTable_s, ASN_INTEGER, wrsPtpPhaseTracking),
......@@ -133,9 +133,6 @@ time_t wrsPtpDataTable_data_fill(unsigned int *n_rows)
&ppsi_defaultDS->clockIdentity,
sizeof(ClockIdentity));
/* wrsPtpMode */
//TODO
/* wrsPtpServoState */
strncpy(ptp_a[si].wrsPtpServoState,
ppsi_servo->servo_state_name,
......
userspace/snmpd/wrsPtpDataTable.h
View file @ c234bd4e
......@@ -14,7 +14,7 @@ struct wrsPtpDataTable_s {
* running FIXME: not implemented */
ClockIdentity wrsPtpGrandmasterID; /* FIXME: not implemented */
ClockIdentity wrsPtpOwnID; /* FIXME: not implemented */
int wrsPtpMode; /* FIXME: not implemented */
int wrsPtpMode_obsolete; /* Obsolete */
char wrsPtpServoState[32]; /* State as string */
int wrsPtpServoStateN; /* state number */
int wrsPtpPhaseTracking;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment