deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add authtype vals table for lan sessions since the mapping

Browse Source 
is not the same as used for authcap
This commit is contained in:
Duncan Laurie 2004-04-02 03:33:47 +00:00
parent a6793b9430
commit 77268f7daa
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ipmitool/src/plugins/lan/lan.c
View File

@ -62,6 +62,15 @@ static struct ipmi_rq_entry * ipmi_req_entries_tail;
int verbose; int verbose;
const struct valstr ipmi_authtype_session_vals[] = {
{ IPMI_SESSION_AUTHTYPE_NONE, "NONE" },
{ IPMI_SESSION_AUTHTYPE_MD2, "MD2" },
{ IPMI_SESSION_AUTHTYPE_MD5, "MD5" },
{ IPMI_SESSION_AUTHTYPE_PASSWORD, "PASSWORD" },
{ IPMI_SESSION_AUTHTYPE_OEM, "OEM" },
{ 0, NULL },
};
static int recv_timeout = IPMI_LAN_TIMEOUT; static int recv_timeout = IPMI_LAN_TIMEOUT;
static int curr_seq; static int curr_seq;
static sigjmp_buf jmpbuf; static sigjmp_buf jmpbuf;
@ -464,7 +473,7 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf)
printbuf(rsp->data, x, "ipmi message header"); printbuf(rsp->data, x, "ipmi message header");
printf("<< IPMI Response Session Header\n"); printf("<< IPMI Response Session Header\n");
printf("<< Authtype : %s\n", printf("<< Authtype : %s\n",
val2str(rsp->session.authtype, ipmi_authtype_vals)); val2str(rsp->session.authtype, ipmi_authtype_session_vals));
printf("<< Sequence : 0x%08lx\n", rsp->session.seq); printf("<< Sequence : 0x%08lx\n", rsp->session.seq);
printf("<< Session ID : 0x%08lx\n", rsp->session.id); printf("<< Session ID : 0x%08lx\n", rsp->session.id);
@ -610,7 +619,8 @@ ipmi_lan_build_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
if (verbose > 2) { if (verbose > 2) {
printf(">> IPMI Request Session Header\n"); printf(">> IPMI Request Session Header\n");
printf(">> Authtype : %s\n", val2str(lan_session.authtype, ipmi_authtype_vals)); printf(">> Authtype : %s\n",
val2str(lan_session.authtype, ipmi_authtype_session_vals));
printf(">> Sequence : 0x%08lx\n", lan_session.in_seq); printf(">> Sequence : 0x%08lx\n", lan_session.in_seq);
printf(">> Session ID : 0x%08lx\n", lan_session.id); printf(">> Session ID : 0x%08lx\n", lan_session.id);
@ -732,8 +742,8 @@ ipmi_get_auth_capabilities_cmd(struct ipmi_intf * intf)
printf("MD2 "); printf("MD2 ");
if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_MD5) if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_MD5)
printf("MD5 "); printf("MD5 ");
if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_KEY) if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD)
printf("KEY "); printf("PASSWORD ");
if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_OEM) if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_OEM)
printf("OEM "); printf("OEM ");
printf("\n"); printf("\n");
@ -755,8 +765,8 @@ ipmi_get_auth_capabilities_cmd(struct ipmi_intf * intf)
lan_session.authtype = IPMI_SESSION_AUTHTYPE_MD5; lan_session.authtype = IPMI_SESSION_AUTHTYPE_MD5;
} }
else if (lan_session.password && else if (lan_session.password &&
rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_KEY) { rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD) {
lan_session.authtype = IPMI_SESSION_AUTHTYPE_KEY; lan_session.authtype = IPMI_SESSION_AUTHTYPE_PASSWORD;
} }
else if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_NONE) { else if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_NONE) {
lan_session.authtype = IPMI_SESSION_AUTHTYPE_NONE; lan_session.authtype = IPMI_SESSION_AUTHTYPE_NONE;
@ -768,7 +778,7 @@ ipmi_get_auth_capabilities_cmd(struct ipmi_intf * intf)
if (verbose > 1) if (verbose > 1)
printf("Proceeding with AuthType %s\n", printf("Proceeding with AuthType %s\n",
val2str(lan_session.authtype, ipmi_authtype_vals)); val2str(lan_session.authtype, ipmi_authtype_session_vals));
return 0; return 0;
} }
@ -862,7 +872,7 @@ ipmi_activate_session_cmd(struct ipmi_intf * intf)
printf(" Privilege Level : %s\n", printf(" Privilege Level : %s\n",
val2str(msg_data[1], ipmi_privlvl_vals)); val2str(msg_data[1], ipmi_privlvl_vals));
printf(" Auth Type : %s\n", printf(" Auth Type : %s\n",
val2str(lan_session.authtype, ipmi_authtype_vals)); val2str(lan_session.authtype, ipmi_authtype_session_vals));
if (lan_session.authtype) if (lan_session.authtype)
printf(" AuthCode : %s\n", printf(" AuthCode : %s\n",
lan_session.authcode); lan_session.authcode);
@ -915,7 +925,7 @@ ipmi_activate_session_cmd(struct ipmi_intf * intf)
if (verbose > 1) { if (verbose > 1) {
printf("\nSession Activated\n"); printf("\nSession Activated\n");
printf(" Auth Type : %s\n", printf(" Auth Type : %s\n",
val2str(rsp->data[0], ipmi_authtype_vals)); val2str(rsp->data[0], ipmi_authtype_session_vals));
printf(" Max Priv Level : %s\n", printf(" Max Priv Level : %s\n",
val2str(rsp->data[9], ipmi_privlvl_vals)); val2str(rsp->data[9], ipmi_privlvl_vals));
printf(" Session ID : %08lx\n", lan_session.id); printf(" Session ID : %08lx\n", lan_session.id);

2
ipmitool/src/plugins/lan/lan.h
View File

@ -49,7 +49,7 @@
#define IPMI_SESSION_AUTHTYPE_NONE 0x0 #define IPMI_SESSION_AUTHTYPE_NONE 0x0
#define IPMI_SESSION_AUTHTYPE_MD2 0x1 #define IPMI_SESSION_AUTHTYPE_MD2 0x1
#define IPMI_SESSION_AUTHTYPE_MD5 0x2 #define IPMI_SESSION_AUTHTYPE_MD5 0x2
#define IPMI_SESSION_AUTHTYPE_KEY 0x4 #define IPMI_SESSION_AUTHTYPE_PASSWORD 0x4
#define IPMI_SESSION_AUTHTYPE_OEM 0x5 #define IPMI_SESSION_AUTHTYPE_OEM 0x5
#define IPMI_SESSION_PRIV_CALLBACK 0x1 #define IPMI_SESSION_PRIV_CALLBACK 0x1