mirror of
https://github.com/ipmitool/ipmitool.git
synced 2026-01-21 16:42:19 +08:00
lan: Refactor pointer style
Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin
Alexander Amelkin
parent
50479484a2
commit
fb47ae8d7c
@ -61,7 +61,7 @@ static struct lan_param {
|
||||
int cmd;
|
||||
int size;
|
||||
char desc[24];
|
||||
uint8_t * data;
|
||||
uint8_t *data;
|
||||
int data_len;
|
||||
} ipmi_lan_params[] = {
|
||||
{ IPMI_LANP_SET_IN_PROGRESS, 1, "Set in Progress", NULL, 0 },
|
||||
@ -123,7 +123,7 @@ static void print_lan_usage(void);
|
||||
* @chan: channel number to check
|
||||
*/
|
||||
static int
|
||||
is_lan_channel(struct ipmi_intf * intf, uint8_t chan)
|
||||
is_lan_channel(struct ipmi_intf *intf, uint8_t chan)
|
||||
{
|
||||
uint8_t medium;
|
||||
|
||||
@ -148,7 +148,7 @@ is_lan_channel(struct ipmi_intf * intf, uint8_t chan)
|
||||
* @start: channel number to start searching from
|
||||
*/
|
||||
uint8_t
|
||||
find_lan_channel(struct ipmi_intf * intf, uint8_t start)
|
||||
find_lan_channel(struct ipmi_intf *intf, uint8_t start)
|
||||
{
|
||||
uint8_t chan = 0;
|
||||
|
||||
@ -174,10 +174,10 @@ find_lan_channel(struct ipmi_intf * intf, uint8_t start)
|
||||
* @select: lan parameter set selector
|
||||
*/
|
||||
static struct lan_param *
|
||||
get_lan_param_select(struct ipmi_intf * intf, uint8_t chan, int param, int select)
|
||||
get_lan_param_select(struct ipmi_intf *intf, uint8_t chan, int param, int select)
|
||||
{
|
||||
struct lan_param * p = NULL;
|
||||
struct ipmi_rs * rsp;
|
||||
struct lan_param *p = NULL;
|
||||
struct ipmi_rs *rsp;
|
||||
struct ipmi_rq req;
|
||||
int i = 0;
|
||||
uint8_t msg_data[4];
|
||||
@ -254,7 +254,7 @@ get_lan_param_select(struct ipmi_intf * intf, uint8_t chan, int param, int selec
|
||||
* @param: lan parameter id
|
||||
*/
|
||||
static struct lan_param *
|
||||
get_lan_param(struct ipmi_intf * intf, uint8_t chan, int param)
|
||||
get_lan_param(struct ipmi_intf *intf, uint8_t chan, int param)
|
||||
{
|
||||
return get_lan_param_select(intf, chan, param, 0);
|
||||
}
|
||||
@ -275,10 +275,10 @@ get_lan_param(struct ipmi_intf * intf, uint8_t chan, int param)
|
||||
* @len: length of lan parameter data
|
||||
*/
|
||||
static int
|
||||
set_lan_param_wait(struct ipmi_intf * intf, uint8_t chan,
|
||||
int param, uint8_t * data, int len)
|
||||
set_lan_param_wait(struct ipmi_intf *intf, uint8_t chan,
|
||||
int param, uint8_t *data, int len)
|
||||
{
|
||||
struct lan_param * p;
|
||||
struct lan_param *p;
|
||||
int retry = 10; /* 10 retries */
|
||||
|
||||
lprintf(LOG_DEBUG, "Waiting for Set LAN Parameter to complete...");
|
||||
@ -334,10 +334,10 @@ set_lan_param_wait(struct ipmi_intf * intf, uint8_t chan,
|
||||
* @wait: whether to wait for write completion
|
||||
*/
|
||||
static int
|
||||
__set_lan_param(struct ipmi_intf * intf, uint8_t chan,
|
||||
int param, uint8_t * data, int len, int wait)
|
||||
__set_lan_param(struct ipmi_intf *intf, uint8_t chan,
|
||||
int param, uint8_t *data, int len, int wait)
|
||||
{
|
||||
struct ipmi_rs * rsp;
|
||||
struct ipmi_rs *rsp;
|
||||
struct ipmi_rq req;
|
||||
uint8_t msg_data[32];
|
||||
|
||||
@ -399,9 +399,9 @@ __set_lan_param(struct ipmi_intf * intf, uint8_t chan,
|
||||
* @chan: ipmi channel
|
||||
*/
|
||||
static int
|
||||
ipmi_lanp_lock_state(struct ipmi_intf * intf, uint8_t chan)
|
||||
ipmi_lanp_lock_state(struct ipmi_intf *intf, uint8_t chan)
|
||||
{
|
||||
struct lan_param * p;
|
||||
struct lan_param *p;
|
||||
p = get_lan_param(intf, chan, IPMI_LANP_SET_IN_PROGRESS);
|
||||
if (!p)
|
||||
return -1;
|
||||
@ -422,7 +422,7 @@ ipmi_lanp_lock_state(struct ipmi_intf * intf, uint8_t chan)
|
||||
* @chan: ipmi channel
|
||||
*/
|
||||
static void
|
||||
ipmi_lanp_lock(struct ipmi_intf * intf, uint8_t chan)
|
||||
ipmi_lanp_lock(struct ipmi_intf *intf, uint8_t chan)
|
||||
{
|
||||
uint8_t val = IPMI_LANP_WRITE_LOCK;
|
||||
int retry = 3;
|
||||
@ -452,7 +452,7 @@ ipmi_lanp_lock(struct ipmi_intf * intf, uint8_t chan)
|
||||
* @chan: ipmi channel
|
||||
*/
|
||||
static void
|
||||
ipmi_lanp_unlock(struct ipmi_intf * intf, uint8_t chan)
|
||||
ipmi_lanp_unlock(struct ipmi_intf *intf, uint8_t chan)
|
||||
{
|
||||
uint8_t val = IPMI_LANP_WRITE_COMMIT;
|
||||
int rc;
|
||||
@ -477,8 +477,8 @@ ipmi_lanp_unlock(struct ipmi_intf * intf, uint8_t chan)
|
||||
* @len: length of lan parameter data
|
||||
*/
|
||||
static int
|
||||
set_lan_param(struct ipmi_intf * intf, uint8_t chan,
|
||||
int param, uint8_t * data, int len)
|
||||
set_lan_param(struct ipmi_intf *intf, uint8_t chan,
|
||||
int param, uint8_t *data, int len)
|
||||
{
|
||||
int rc;
|
||||
ipmi_lanp_lock(intf, chan);
|
||||
@ -498,8 +498,8 @@ set_lan_param(struct ipmi_intf * intf, uint8_t chan,
|
||||
* @len: length of lan parameter data
|
||||
*/
|
||||
static int
|
||||
set_lan_param_nowait(struct ipmi_intf * intf, uint8_t chan,
|
||||
int param, uint8_t * data, int len)
|
||||
set_lan_param_nowait(struct ipmi_intf *intf, uint8_t chan,
|
||||
int param, uint8_t *data, int len)
|
||||
{
|
||||
int rc;
|
||||
ipmi_lanp_lock(intf, chan);
|
||||
@ -509,7 +509,7 @@ set_lan_param_nowait(struct ipmi_intf * intf, uint8_t chan,
|
||||
}
|
||||
|
||||
static int
|
||||
lan_set_arp_interval(struct ipmi_intf * intf, uint8_t chan, uint8_t ival)
|
||||
lan_set_arp_interval(struct ipmi_intf *intf, uint8_t chan, uint8_t ival)
|
||||
{
|
||||
struct lan_param *lp;
|
||||
uint8_t interval = 0;
|
||||
@ -539,7 +539,7 @@ lan_set_arp_interval(struct ipmi_intf * intf, uint8_t chan, uint8_t ival)
|
||||
}
|
||||
|
||||
static int
|
||||
lan_set_arp_generate(struct ipmi_intf * intf,
|
||||
lan_set_arp_generate(struct ipmi_intf *intf,
|
||||
uint8_t chan, uint8_t ctl)
|
||||
{
|
||||
struct lan_param *lp;
|
||||
@ -563,7 +563,7 @@ lan_set_arp_generate(struct ipmi_intf * intf,
|
||||
}
|
||||
|
||||
static int
|
||||
lan_set_arp_respond(struct ipmi_intf * intf,
|
||||
lan_set_arp_respond(struct ipmi_intf *intf,
|
||||
uint8_t chan, uint8_t ctl)
|
||||
{
|
||||
struct lan_param *lp;
|
||||
@ -615,9 +615,9 @@ static char priv_level_to_char(unsigned char priv_level)
|
||||
|
||||
|
||||
static int
|
||||
ipmi_lan_print(struct ipmi_intf * intf, uint8_t chan)
|
||||
ipmi_lan_print(struct ipmi_intf *intf, uint8_t chan)
|
||||
{
|
||||
struct lan_param * p;
|
||||
struct lan_param *p;
|
||||
|
||||
if (chan < 1 || chan > IPMI_CHANNEL_NUMBER_MAX) {
|
||||
lprintf(LOG_ERR, "Invalid Channel %d", chan);
|
||||
@ -903,12 +903,12 @@ ipmi_lan_print(struct ipmi_intf * intf, uint8_t chan)
|
||||
/* Configure Authentication Types */
|
||||
/* TODO - probably some code duplication going on ??? */
|
||||
static int
|
||||
ipmi_lan_set_auth(struct ipmi_intf * intf, uint8_t chan, char * level, char * types)
|
||||
ipmi_lan_set_auth(struct ipmi_intf *intf, uint8_t chan, char *level, char *types)
|
||||
{
|
||||
uint8_t data[5];
|
||||
uint8_t authtype = 0;
|
||||
char * p;
|
||||
struct lan_param * lp;
|
||||
char *p;
|
||||
struct lan_param *lp;
|
||||
|
||||
if (!level || !types)
|
||||
return -1;
|
||||
@ -1144,7 +1144,7 @@ ipmi_set_user_access(struct ipmi_intf *intf, uint8_t channel, uint8_t user_id)
|
||||
|
||||
|
||||
static int
|
||||
get_cmdline_cipher_suite_priv_data(char * arg, uint8_t * buf)
|
||||
get_cmdline_cipher_suite_priv_data(char *arg, uint8_t *buf)
|
||||
{
|
||||
int i, ret = 0;
|
||||
|
||||
@ -1221,7 +1221,7 @@ get_cmdline_cipher_suite_priv_data(char * arg, uint8_t * buf)
|
||||
|
||||
|
||||
static int
|
||||
get_cmdline_ipaddr(char * arg, uint8_t * buf)
|
||||
get_cmdline_ipaddr(char *arg, uint8_t *buf)
|
||||
{
|
||||
uint32_t ip1, ip2, ip3, ip4;
|
||||
if (sscanf(arg,
|
||||
@ -1373,7 +1373,7 @@ get_cmdline_bad_pass_thresh(char *argv[], uint8_t *buf)
|
||||
}
|
||||
|
||||
static int
|
||||
ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
|
||||
ipmi_lan_set(struct ipmi_intf *intf, int argc, char **argv)
|
||||
{
|
||||
uint8_t data[32];
|
||||
uint8_t chan;
|
||||
@ -1729,9 +1729,9 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
|
||||
|
||||
|
||||
static int
|
||||
is_alert_destination(struct ipmi_intf * intf, uint8_t channel, uint8_t alert)
|
||||
is_alert_destination(struct ipmi_intf *intf, uint8_t channel, uint8_t alert)
|
||||
{
|
||||
struct lan_param * p;
|
||||
struct lan_param *p;
|
||||
|
||||
p = get_lan_param(intf, channel, IPMI_LANP_NUM_DEST);
|
||||
if (!p)
|
||||
@ -1746,7 +1746,7 @@ is_alert_destination(struct ipmi_intf * intf, uint8_t channel, uint8_t alert)
|
||||
}
|
||||
|
||||
static int
|
||||
ipmi_lan_alert_print(struct ipmi_intf * intf, uint8_t channel, uint8_t alert)
|
||||
ipmi_lan_alert_print(struct ipmi_intf *intf, uint8_t channel, uint8_t alert)
|
||||
{
|
||||
# define PTYPE_LEN 4
|
||||
# define PADDR_LEN 13
|
||||
@ -1820,10 +1820,10 @@ ipmi_lan_alert_print(struct ipmi_intf * intf, uint8_t channel, uint8_t alert)
|
||||
}
|
||||
|
||||
static int
|
||||
ipmi_lan_alert_print_all(struct ipmi_intf * intf, uint8_t channel)
|
||||
ipmi_lan_alert_print_all(struct ipmi_intf *intf, uint8_t channel)
|
||||
{
|
||||
int j, ndest;
|
||||
struct lan_param * p;
|
||||
struct lan_param *p;
|
||||
|
||||
p = get_lan_param(intf, channel, IPMI_LANP_NUM_DEST);
|
||||
if (!p)
|
||||
@ -1840,10 +1840,10 @@ ipmi_lan_alert_print_all(struct ipmi_intf * intf, uint8_t channel)
|
||||
}
|
||||
|
||||
static int
|
||||
ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
|
||||
int argc, char ** argv)
|
||||
ipmi_lan_alert_set(struct ipmi_intf *intf, uint8_t chan, uint8_t alert,
|
||||
int argc, char **argv)
|
||||
{
|
||||
struct lan_param * p;
|
||||
struct lan_param *p;
|
||||
uint8_t data[32], temp[32];
|
||||
int rc = 0;
|
||||
|
||||
@ -2013,7 +2013,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
|
||||
}
|
||||
|
||||
static int
|
||||
ipmi_lan_alert(struct ipmi_intf * intf, int argc, char ** argv)
|
||||
ipmi_lan_alert(struct ipmi_intf *intf, int argc, char **argv)
|
||||
{
|
||||
uint8_t alert;
|
||||
uint8_t channel = 1;
|
||||
@ -2105,10 +2105,10 @@ ipmi_lan_alert(struct ipmi_intf * intf, int argc, char ** argv)
|
||||
|
||||
|
||||
static int
|
||||
ipmi_lan_stats_get(struct ipmi_intf * intf, uint8_t chan)
|
||||
ipmi_lan_stats_get(struct ipmi_intf *intf, uint8_t chan)
|
||||
{
|
||||
int rc = 0;
|
||||
struct ipmi_rs * rsp;
|
||||
struct ipmi_rs *rsp;
|
||||
struct ipmi_rq req;
|
||||
uint8_t msg_data[2];
|
||||
uint16_t statsTemp;
|
||||
@ -2183,10 +2183,10 @@ ipmi_lan_stats_get(struct ipmi_intf * intf, uint8_t chan)
|
||||
|
||||
|
||||
static int
|
||||
ipmi_lan_stats_clear(struct ipmi_intf * intf, uint8_t chan)
|
||||
ipmi_lan_stats_clear(struct ipmi_intf *intf, uint8_t chan)
|
||||
{
|
||||
int rc = 0;
|
||||
struct ipmi_rs * rsp;
|
||||
struct ipmi_rs *rsp;
|
||||
struct ipmi_rq req;
|
||||
uint8_t msg_data[2];
|
||||
|
||||
@ -2473,7 +2473,7 @@ print_lan_usage(void)
|
||||
|
||||
|
||||
int
|
||||
ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv)
|
||||
ipmi_lanp_main(struct ipmi_intf *intf, int argc, char **argv)
|
||||
{
|
||||
int rc = 0;
|
||||
uint8_t chan = 0;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user