? Makefile.in ? aclocal.m4 ? autom4te.cache ? config.guess ? config.h.in ? config.sub ? configure ? depcomp ? install-sh ? ltmain.sh ? missing ? stderr ? bmc-info/Makefile.in ? bmc-info/doc/Makefile.in ? bmc-info/src/Makefile.in ? bmc-watchdog/Makefile.in ? bmc-watchdog/src/Makefile.in ? common/Makefile.in ? common/doc/Makefile.in ? common/src/Makefile.in ? doc/Makefile.in ? doc/freeipmi-faq.info ? doc/freeipmi.info ? doc/mdate-sh ? doc/stamp-1 ? doc/stamp-vti ? doc/texinfo.tex ? doc/version-doc.texi ? doc/version-faq.texi ? doc/examples/Makefile.in ? fish/Makefile.in ? fish/extensions/Makefile.in ? fish/scripts/Makefile.in ? fish/scripts/bmc-autoconfig/Makefile.in ? fish/scripts/bmc-config/Makefile.in ? fish/scripts/pef/Makefile.in ? fish/scripts/sel/Makefile.in ? fish/scripts/sensors/Makefile.in ? fish/src/Makefile.in ? garpd/Makefile.in ? garpd/src/Makefile.in ? ipmi-locate/Makefile.in ? ipmi-locate/src/Makefile.in ? ipmi-raw/Makefile.in ? ipmi-raw/doc/Makefile.in ? ipmi-raw/src/Makefile.in ? ipmiping/Makefile.in ? ipmiping/src/Makefile.in ? ipmipower/Makefile.in ? ipmipower/src/Makefile.in ? libfreeipmi/Makefile.in ? libfreeipmi/src/Makefile.in ? rmcpping/Makefile.in ? rmcpping/src/Makefile.in Index: bmc-info/src/bmc-info.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/bmc-info/src/bmc-info.c,v retrieving revision 1.3 diff -p -u -r1.3 bmc-info.c --- bmc-info/src/bmc-info.c 6 Jan 2006 01:42:51 -0000 1.3 +++ bmc-info/src/bmc-info.c 19 Jan 2006 13:35:37 -0000 @@ -57,19 +57,19 @@ display_get_dev_id (ipmi_device_t *dev) FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "dev_id", + (uint8_t *)"dev_id", &val); fprintf (stdout, "Device ID: %X\n", (unsigned int) val); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "dev_rev.rev", + (uint8_t *)"dev_rev.rev", &val); fprintf (stdout, "Device Revision: %d\n", (unsigned int) val); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "dev_rev.sdr_support", + (uint8_t *)"dev_rev.sdr_support", &val); if (val) fprintf (stdout, " [SDR Support]\n"); @@ -78,11 +78,11 @@ display_get_dev_id (ipmi_device_t *dev) uint64_t maj, min; FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "firmware_rev1.major_rev", + (uint8_t *)"firmware_rev1.major_rev", &maj); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "firmware_rev2.minor_rev", + (uint8_t *)"firmware_rev2.minor_rev", &min); fprintf (stdout, "Firmware Revision: %d.%d\n", (unsigned int) maj, (unsigned int) min); @@ -90,7 +90,7 @@ display_get_dev_id (ipmi_device_t *dev) FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "firmware_rev1.dev_available", + (uint8_t *)"firmware_rev1.dev_available", &val); if (val == 0) fprintf (stdout, @@ -107,11 +107,11 @@ display_get_dev_id (ipmi_device_t *dev) uint64_t ms, ls; FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "ipmi_ver.ms_bits", + (uint8_t *)"ipmi_ver.ms_bits", &ms); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "ipmi_ver.ls_bits", + (uint8_t *)"ipmi_ver.ls_bits", &ls); fprintf (stdout, "IPMI Version: %d.%d\n", (unsigned int) ms, (unsigned int) ls); @@ -121,56 +121,56 @@ display_get_dev_id (ipmi_device_t *dev) FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.sensor_dev", + (uint8_t *)"additional_dev_support.sensor_dev", &val); if(val) fprintf (stdout, " [Sensor Device]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.sdr_repo_dev", + (uint8_t *)"additional_dev_support.sdr_repo_dev", &val); if(val) fprintf (stdout, " [SDR Repository Device]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.sel_dev", + (uint8_t *)"additional_dev_support.sel_dev", &val); if(val) fprintf (stdout, " [SEL Device]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.fru_inventory_dev", + (uint8_t *)"additional_dev_support.fru_inventory_dev", &val); if(val) fprintf (stdout, " [FRU Inventory Device]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.ipmb_evnt_receiver", + (uint8_t *)"additional_dev_support.ipmb_evnt_receiver", &val); if(val) fprintf (stdout, " [IPMB Event Receiver]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.ipmb_evnt_generator", + (uint8_t *)"additional_dev_support.ipmb_evnt_generator", &val); if(val) fprintf (stdout, " [IPMB Event Generator]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.bridge", + (uint8_t *)"additional_dev_support.bridge", &val); if(val) fprintf (stdout, " [Bridge]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.chassis_dev", + (uint8_t *)"additional_dev_support.chassis_dev", &val); if(val) fprintf (stdout, " [Chassis Device]\n"); @@ -178,13 +178,13 @@ display_get_dev_id (ipmi_device_t *dev) { uint64_t manf_id, prod_id; - FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, "manf_id.id", &manf_id); + FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, (uint8_t *)"manf_id.id", &manf_id); fprintf (stdout, "Manufacturer ID: %Xh\n", (unsigned int) manf_id); - FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, "prod_id", &prod_id); + FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, (uint8_t *)"prod_id", &prod_id); fprintf (stdout, "Product ID: %Xh\n", (unsigned int) prod_id); - FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, "aux_firmware_rev_info", &val); + FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, (uint8_t *)"aux_firmware_rev_info", &val); switch (manf_id) { case IPMI_MANF_ID_INTEL: @@ -198,19 +198,19 @@ display_get_dev_id (ipmi_device_t *dev) uint64_t bc_maj, bc_min, pia_maj, pia_min; FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_sr870bn4_rs, - "aux_firmware_rev_info.boot_code.major", + (uint8_t *)"aux_firmware_rev_info.boot_code.major", &bc_maj); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_sr870bn4_rs, - "aux_firmware_rev_info.boot_code.minor", + (uint8_t *)"aux_firmware_rev_info.boot_code.minor", &bc_min); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_sr870bn4_rs, - "aux_firmware_rev_info.pia.major", + (uint8_t *)"aux_firmware_rev_info.pia.major", &pia_maj); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_sr870bn4_rs, - "aux_firmware_rev_info.pia.minor", + (uint8_t *)"aux_firmware_rev_info.pia.minor", &pia_min); fprintf (stdout, "Aux Firmware Revision Info: Boot Code v%02x.%2x, PIA v%02x.%2x\n", @@ -246,20 +246,20 @@ get_channel_info_list (ipmi_device_t *de fiid_obj_get (data_rs, tmpl_get_channel_info_rs, - "actual_channel_number", + (uint8_t *)"actual_channel_number", &val); channel_info_list[ci].channel_number = (uint8_t) val; fiid_obj_get (data_rs, tmpl_get_channel_info_rs, - "channel_medium_type", + (uint8_t *)"channel_medium_type", &val); channel_info_list[ci].medium_type = channel_info_list[ci].actual_medium_type = (uint8_t) val; fiid_obj_get (data_rs, tmpl_get_channel_info_rs, - "channel_protocol_type", + (uint8_t *)"channel_protocol_type", &val); channel_info_list[ci].protocol_type = channel_info_list[ci].actual_protocol_type = (uint8_t) val; Index: bmc-watchdog/src/bmc-watchdog.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/bmc-watchdog/src/bmc-watchdog.c,v retrieving revision 1.32 diff -p -u -r1.32 bmc-watchdog.c --- bmc-watchdog/src/bmc-watchdog.c 7 Jan 2006 03:24:32 -0000 1.32 +++ bmc-watchdog/src/bmc-watchdog.c 19 Jan 2006 13:35:38 -0000 @@ -464,7 +464,7 @@ _cmd(char *str, int retry_wait_time, int } #endif - _FIID_OBJ_GET(cmd_rs, tmpl_rs, "comp_code", &comp_code, str); + _FIID_OBJ_GET(cmd_rs, tmpl_rs, (uint8_t *)"comp_code", &comp_code, str); if (comp_code != IPMI_COMMAND_SUCCESS) _bmclog("%s: cmd error: %Xh", str, comp_code); @@ -647,69 +647,69 @@ _get_watchdog_timer_cmd(int retry_wait_t goto cleanup; if (timer_use) - _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, "timer_use", + _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, (uint8_t *)"timer_use", timer_use, "_get_watchdog_timer_cmd"); if (timer_state) - _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, "timer_state", + _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, (uint8_t *)"timer_state", timer_state, "_get_watchdog_timer_cmd"); if (log) - _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, "log", + _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, (uint8_t *)"log", log, "_get_watchdog_timer_cmd"); if (timeout_action) - _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, "timeout_action", + _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, (uint8_t *)"timeout_action", timeout_action, "_get_watchdog_timer_cmd"); if (pre_timeout_interrupt) _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "pre_timeout_interrupt", pre_timeout_interrupt, + (uint8_t *)"pre_timeout_interrupt", pre_timeout_interrupt, "_get_watchdog_timer_cmd"); if (pre_timeout_interval) _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "pre_timeout_interval", pre_timeout_interval, + (uint8_t *)"pre_timeout_interval", pre_timeout_interval, "_get_watchdog_timer_cmd"); if (timer_use_expiration_flag_bios_frb2) _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "timer_use_expiration_flag_bios_frb2", + (uint8_t *)"timer_use_expiration_flag_bios_frb2", timer_use_expiration_flag_bios_frb2, "_get_watchdog_timer_cmd"); if (timer_use_expiration_flag_bios_post) _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "timer_use_expiration_flag_bios_post", + (uint8_t *)"timer_use_expiration_flag_bios_post", timer_use_expiration_flag_bios_post, "_get_watchdog_timer_cmd"); if (timer_use_expiration_flag_os_load) _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "timer_use_expiration_flag_os_load", + (uint8_t *)"timer_use_expiration_flag_os_load", timer_use_expiration_flag_os_load, "_get_watchdog_timer_cmd"); if (timer_use_expiration_flag_sms_os) _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "timer_use_expiration_flag_sms_os", + (uint8_t *)"timer_use_expiration_flag_sms_os", timer_use_expiration_flag_sms_os, "_get_watchdog_timer_cmd"); if (timer_use_expiration_flag_oem) _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "timer_use_expiration_flag_oem", + (uint8_t *)"timer_use_expiration_flag_oem", timer_use_expiration_flag_oem, "_get_watchdog_timer_cmd"); if (initial_countdown_seconds) { _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "initial_countdown_value_ls_byte", + (uint8_t *)"initial_countdown_value_ls_byte", &ls_byte, "_get_watchdog_timer_cmd"); _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "initial_countdown_value_ms_byte", + (uint8_t *)"initial_countdown_value_ms_byte", &ms_byte, "_get_watchdog_timer_cmd"); *initial_countdown_seconds = _time_seconds(ls_byte, ms_byte); } @@ -717,10 +717,10 @@ _get_watchdog_timer_cmd(int retry_wait_t if (present_countdown_seconds) { _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "present_countdown_value_ls_byte", + (uint8_t *)"present_countdown_value_ls_byte", &ls_byte, "_get_watchdog_timer_cmd"); _FIID_OBJ_GET(cmd_rs, tmpl_cmd_get_watchdog_timer_rs, - "present_countdown_value_ms_byte", + (uint8_t *)"present_countdown_value_ms_byte", &ms_byte, "_get_watchdog_timer_cmd"); *present_countdown_seconds = _time_seconds(ls_byte, ms_byte); } Index: fish/src/bmc-conf2.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/fish/src/bmc-conf2.c,v retrieving revision 1.13 diff -p -u -r1.13 bmc-conf2.c --- fish/src/bmc-conf2.c 16 Dec 2005 08:48:39 -0000 1.13 +++ fish/src/bmc-conf2.c 19 Jan 2006 13:35:39 -0000 @@ -92,7 +92,7 @@ set_bmc_username (ipmi_device_t *dev, fiid_obj_alloca (obj_cmd_rs, tmpl_set_user_name_rs); if (ipmi_cmd_set_user_name2 (dev, userid, - username, + (char *)username, obj_cmd_rs) != 0) { return (-1); @@ -115,7 +115,7 @@ set_bmc_enable_user (ipmi_device_t *dev, userid, (user_status ? IPMI_PASSWORD_OPERATION_ENABLE_USER : IPMI_PASSWORD_OPERATION_DISABLE_USER), - password, + (char *)password, obj_cmd_rs) != 0) { return (-1); @@ -135,7 +135,7 @@ set_bmc_user_password (ipmi_device_t *de if (ipmi_cmd_set_user_password2 (dev, userid, IPMI_PASSWORD_OPERATION_SET_PASSWORD, - password, + (char *)password, obj_cmd_rs) != 0) { return (-1); @@ -835,25 +835,25 @@ get_bmc_user_access (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, tmpl_get_user_access_rs, - "user_privilege_level_limit", + (uint8_t *)"user_privilege_level_limit", &val); *privilege_limit = (uint8_t) val; fiid_obj_get (obj_cmd_rs, tmpl_get_user_access_rs, - "user_flags.enable_ipmi_msgs", + (uint8_t *)"user_flags.enable_ipmi_msgs", &val); *enable_ipmi_msgs = (uint8_t) val; fiid_obj_get (obj_cmd_rs, tmpl_get_user_access_rs, - "user_flags.enable_link_auth", + (uint8_t *)"user_flags.enable_link_auth", &val); *enable_link_auth = (uint8_t) val; fiid_obj_get (obj_cmd_rs, tmpl_get_user_access_rs, - "user_flags.restrict_to_callback", + (uint8_t *)"user_flags.restrict_to_callback", &val); *enable_restrict_to_callback = (uint8_t) val; @@ -887,31 +887,31 @@ get_bmc_channel_access (ipmi_device_t *d fiid_obj_get (obj_cmd_rs, tmpl_get_channel_access_rs, - "ipmi_messaging_access_mode", + (uint8_t *)"ipmi_messaging_access_mode", &val); *access_mode = val; fiid_obj_get (obj_cmd_rs, tmpl_get_channel_access_rs, - "user_level_authentication", + (uint8_t *)"user_level_authentication", &val); *user_level_auth = (val ? 0 : 1); fiid_obj_get (obj_cmd_rs, tmpl_get_channel_access_rs, - "per_message_authentication", + (uint8_t *)"per_message_authentication", &val); *per_message_auth = (val ? 0 : 1); fiid_obj_get (obj_cmd_rs, tmpl_get_channel_access_rs, - "pef_alerting", + (uint8_t *)"pef_alerting", &val); *pef_alerting = (val ? 0 : 1); fiid_obj_get (obj_cmd_rs, tmpl_get_channel_access_rs, - "channel_privilege_level_limit", + (uint8_t *)"channel_privilege_level_limit", &val); *privilege_limit = val; @@ -928,7 +928,7 @@ get_bmc_username (ipmi_device_t *dev, if (userid == 1) { - strcpy (username, "NULL"); + strcpy ((char *)username, "NULL"); return (0); } @@ -942,7 +942,7 @@ get_bmc_username (ipmi_device_t *dev, fiid_obj_get_data (obj_cmd_rs, tmpl_get_user_name_rs, - "user_name", + (uint8_t *)"user_name", username, username_len); @@ -1043,7 +1043,7 @@ get_bmc_lan_conf_ip_addr_source (ipmi_de fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_ip_addr_source_rs, - "ip_addr_source", + (uint8_t *)"ip_addr_source", &val); *ip_addr_source = val; @@ -1070,7 +1070,7 @@ get_bmc_lan_conf_ip_addr (ipmi_device_t fiid_obj_get_data (obj_cmd_rs, tmpl_get_lan_conf_param_ip_addr_rs, - "ip_addr", + (uint8_t *)"ip_addr", ip_addr_bytes, 4); sprintf (ip_addr, @@ -1103,7 +1103,7 @@ get_bmc_lan_conf_mac_addr (ipmi_device_t fiid_obj_get_data (obj_cmd_rs, tmpl_get_lan_conf_param_mac_addr_rs, - "mac_addr", + (uint8_t *)"mac_addr", mac_addr_bytes, 6); sprintf (mac_addr, @@ -1138,7 +1138,7 @@ get_bmc_lan_conf_subnet_mask (ipmi_devic fiid_obj_get_data (obj_cmd_rs, tmpl_get_lan_conf_param_subnet_mask_rs, - "subnet_mask", + (uint8_t *)"subnet_mask", subnet_mask_bytes, 4); sprintf (subnet_mask, @@ -1171,7 +1171,7 @@ get_bmc_lan_conf_default_gw_ip_addr (ipm fiid_obj_get_data (obj_cmd_rs, tmpl_get_lan_conf_param_gw_ip_addr_rs, - "ip_addr", + (uint8_t *)"ip_addr", ip_addr_bytes, 4); sprintf (default_gw_ip_addr, @@ -1204,7 +1204,7 @@ get_bmc_lan_conf_default_gw_mac_addr (ip fiid_obj_get_data (obj_cmd_rs, tmpl_get_lan_conf_param_mac_addr_rs, - "mac_addr", + (uint8_t *)"mac_addr", mac_addr_bytes, 6); sprintf (default_gw_mac_addr, @@ -1239,7 +1239,7 @@ get_bmc_lan_conf_backup_gw_ip_addr (ipmi fiid_obj_get_data (obj_cmd_rs, tmpl_get_lan_conf_param_gw_ip_addr_rs, - "ip_addr", + (uint8_t *)"ip_addr", ip_addr_bytes, 4); sprintf (backup_gw_ip_addr, @@ -1272,7 +1272,7 @@ get_bmc_lan_conf_backup_gw_mac_addr (ipm fiid_obj_get_data (obj_cmd_rs, tmpl_get_lan_conf_param_mac_addr_rs, - "mac_addr", + (uint8_t *)"mac_addr", mac_addr_bytes, 6); sprintf (backup_gw_mac_addr, @@ -1309,12 +1309,12 @@ get_bmc_lan_conf_vlan_id (ipmi_device_t fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_vlan_id_rs, - "vlan_id_ls", + (uint8_t *)"vlan_id_ls", &ls_val); fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_vlan_id_rs, - "vlan_id_ms", + (uint8_t *)"vlan_id_ms", &ms_val); ptr = (uint8_t *)vlan_id; @@ -1328,7 +1328,7 @@ get_bmc_lan_conf_vlan_id (ipmi_device_t fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_vlan_id_rs, - "vlan_id_flag", + (uint8_t *)"vlan_id_flag", &val); *vlan_id_flag = val; @@ -1355,7 +1355,7 @@ get_bmc_lan_conf_vlan_priority (ipmi_dev fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_vlan_priority_rs, - "vlan_priority", + (uint8_t *)"vlan_priority", &val); *vlan_priority = val; @@ -1382,151 +1382,151 @@ get_bmc_lan_conf_auth_type_enables (ipmi fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_callback_level.none", + (uint8_t *)"max_privilege_auth_type_callback_level.none", &val); bmc_auth_level->callback.type_none = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_callback_level.md2", + (uint8_t *)"max_privilege_auth_type_callback_level.md2", &val); bmc_auth_level->callback.type_md2 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_callback_level.md5", + (uint8_t *)"max_privilege_auth_type_callback_level.md5", &val); bmc_auth_level->callback.type_md5 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_callback_level.straight_password", + (uint8_t *)"max_privilege_auth_type_callback_level.straight_password", &val); bmc_auth_level->callback.type_straight_password = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_callback_level.oem_proprietary", + (uint8_t *)"max_privilege_auth_type_callback_level.oem_proprietary", &val); bmc_auth_level->callback.type_oem_proprietary = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_user_level.none", + (uint8_t *)"max_privilege_auth_type_user_level.none", &val); bmc_auth_level->user.type_none = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_user_level.md2", + (uint8_t *)"max_privilege_auth_type_user_level.md2", &val); bmc_auth_level->user.type_md2 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_user_level.md5", + (uint8_t *)"max_privilege_auth_type_user_level.md5", &val); bmc_auth_level->user.type_md5 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_user_level.straight_password", + (uint8_t *)"max_privilege_auth_type_user_level.straight_password", &val); bmc_auth_level->user.type_straight_password = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_user_level.oem_proprietary", + (uint8_t *)"max_privilege_auth_type_user_level.oem_proprietary", &val); bmc_auth_level->user.type_oem_proprietary = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_operator_level.none", + (uint8_t *)"max_privilege_auth_type_operator_level.none", &val); bmc_auth_level->operator.type_none = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_operator_level.md2", + (uint8_t *)"max_privilege_auth_type_operator_level.md2", &val); bmc_auth_level->operator.type_md2 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_operator_level.md5", + (uint8_t *)"max_privilege_auth_type_operator_level.md5", &val); bmc_auth_level->operator.type_md5 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_operator_level.straight_password", + (uint8_t *)"max_privilege_auth_type_operator_level.straight_password", &val); bmc_auth_level->operator.type_straight_password = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_operator_level.oem_proprietary", + (uint8_t *)"max_privilege_auth_type_operator_level.oem_proprietary", &val); bmc_auth_level->operator.type_oem_proprietary = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_admin_level.none", + (uint8_t *)"max_privilege_auth_type_admin_level.none", &val); bmc_auth_level->admin.type_none = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_admin_level.md2", + (uint8_t *)"max_privilege_auth_type_admin_level.md2", &val); bmc_auth_level->admin.type_md2 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_admin_level.md5", + (uint8_t *)"max_privilege_auth_type_admin_level.md5", &val); bmc_auth_level->admin.type_md5 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_admin_level.straight_password", + (uint8_t *)"max_privilege_auth_type_admin_level.straight_password", &val); bmc_auth_level->admin.type_straight_password = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_admin_level.oem_proprietary", + (uint8_t *)"max_privilege_auth_type_admin_level.oem_proprietary", &val); bmc_auth_level->admin.type_oem_proprietary = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_oem_level.none", + (uint8_t *)"max_privilege_auth_type_oem_level.none", &val); bmc_auth_level->oem.type_none = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_oem_level.md2", + (uint8_t *)"max_privilege_auth_type_oem_level.md2", &val); bmc_auth_level->oem.type_md2 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_oem_level.md5", + (uint8_t *)"max_privilege_auth_type_oem_level.md5", &val); bmc_auth_level->oem.type_md5 = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_oem_level.straight_password", + (uint8_t *)"max_privilege_auth_type_oem_level.straight_password", &val); bmc_auth_level->oem.type_straight_password = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_auth_type_enables_rs, - "max_privilege_auth_type_oem_level.oem_proprietary", + (uint8_t *)"max_privilege_auth_type_oem_level.oem_proprietary", &val); bmc_auth_level->oem.type_oem_proprietary = val; @@ -1554,13 +1554,13 @@ get_bmc_lan_conf_arp_control (ipmi_devic fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_bmc_generated_arp_control_rs, - "bmc_generated_gratuitous_arps_flag", + (uint8_t *)"bmc_generated_gratuitous_arps_flag", &val); *enable_gratuitous_arps = val; fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_bmc_generated_arp_control_rs, - "bmc_generated_arp_responses_flag", + (uint8_t *)"bmc_generated_arp_responses_flag", &val); *enable_arp_response = val; @@ -1587,7 +1587,7 @@ get_bmc_lan_conf_gratuitous_arp (ipmi_de fiid_obj_get (obj_cmd_rs, tmpl_get_lan_conf_param_gratuitous_arp_interval_rs, - "gratuitous_arp_interval", + (uint8_t *)"gratuitous_arp_interval", &val); *gratuitous_arp_interval = val; @@ -1653,25 +1653,25 @@ get_bmc_serial_conf_conn_mode (ipmi_devi fiid_obj_get (obj_cmd_rs, tmpl_get_serial_conf_param_connmode_rs, - "basic_mode_enable", + (uint8_t *)"basic_mode_enable", &val); *enable_basic_mode = val; fiid_obj_get (obj_cmd_rs, tmpl_get_serial_conf_param_connmode_rs, - "ppp_mode_enable", + (uint8_t *)"ppp_mode_enable", &val); *enable_ppp_mode = val; fiid_obj_get (obj_cmd_rs, tmpl_get_serial_conf_param_connmode_rs, - "terminal_mode_enable", + (uint8_t *)"terminal_mode_enable", &val); *enable_terminal_mode = val; fiid_obj_get (obj_cmd_rs, tmpl_get_serial_conf_param_connmode_rs, - "direct", + (uint8_t *)"direct", &val); *connect_mode = val; @@ -1698,7 +1698,7 @@ get_bmc_serial_conf_page_blackout_interv fiid_obj_get (obj_cmd_rs, tmpl_get_serial_conf_param_pageblackout_rs, - "page_blackout_interval", + (uint8_t *)"page_blackout_interval", &val); *page_blackout_interval = val; @@ -1725,7 +1725,7 @@ get_bmc_serial_conf_call_retry_time (ipm fiid_obj_get (obj_cmd_rs, tmpl_get_serial_conf_param_retry_rs, - "retry_time", + (uint8_t *)"retry_time", &val); *call_retry_time = val; @@ -1754,19 +1754,19 @@ get_bmc_serial_conf_ipmi_msg_comm_settin fiid_obj_get (obj_cmd_rs, tmpl_get_serial_conf_param_commbits_rs, - "dtr_hangup", + (uint8_t *)"dtr_hangup", &val); *dtr_hangup = val; fiid_obj_get (obj_cmd_rs, tmpl_get_serial_conf_param_commbits_rs, - "flow_control", + (uint8_t *)"flow_control", &val); *flow_control = val; fiid_obj_get (obj_cmd_rs, tmpl_get_serial_conf_param_commbits_rs, - "bit_rate", + (uint8_t *)"bit_rate", &val); *bit_rate = val; @@ -1788,7 +1788,7 @@ get_bmc_power_restore_policy (ipmi_devic fiid_obj_get (obj_cmd_rs, tmpl_cmd_get_chassis_status_rs, - "power_state.power_restore_policy", + (uint8_t *)"power_state.power_restore_policy", &val); *power_restore_policy = val; @@ -1817,25 +1817,25 @@ get_pef_control (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_pef_control_rs, - "enable_pef", + (uint8_t *)"enable_pef", &val); *pef_enable = val; fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_pef_control_rs, - "enable_pef_event_msgs", + (uint8_t *)"enable_pef_event_msgs", &val); *pef_event_msgs_enable = val; fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_pef_control_rs, - "enable_startup_delay", + (uint8_t *)"enable_startup_delay", &val); *pef_startup_delay_enable = val; fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_pef_control_rs, - "enable_alert_startup_delay", + (uint8_t *)"enable_alert_startup_delay", &val); *pef_alert_startup_delay_enable = val; @@ -1866,37 +1866,37 @@ get_pef_global_action_control (ipmi_devi fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_global_action_control_rs, - "enable_alert_action", + (uint8_t *)"enable_alert_action", &val); *alert_action_enable = val; fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_global_action_control_rs, - "enable_powerdown_action", + (uint8_t *)"enable_powerdown_action", &val); *powerdown_action_enable = val; fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_global_action_control_rs, - "enable_reset_action", + (uint8_t *)"enable_reset_action", &val); *reset_action_enable = val; fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_global_action_control_rs, - "enable_powercycle_action", + (uint8_t *)"enable_powercycle_action", &val); *powercycle_action_enable = val; fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_global_action_control_rs, - "enable_oem_action", + (uint8_t *)"enable_oem_action", &val); *oem_action_enable = val; fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_global_action_control_rs, - "enable_diag_interrupt", + (uint8_t *)"enable_diag_interrupt", &val); *diag_interrupt_enable = val; @@ -1922,7 +1922,7 @@ get_pef_startup_delay (ipmi_device_t *de fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_startup_delay_rs, - "pef_startup_delay", + (uint8_t *)"pef_startup_delay", &val); *pef_startup_delay = val; @@ -1948,7 +1948,7 @@ get_pef_alert_startup_delay (ipmi_device fiid_obj_get (obj_cmd_rs, tmpl_get_pef_conf_param_alert_startup_delay_rs, - "pef_alert_startup_delay", + (uint8_t *)"pef_alert_startup_delay", &val); *pef_alert_startup_delay = val; @@ -1967,7 +1967,7 @@ check_bmc_user_password (ipmi_device_t * if (ipmi_cmd_set_user_password2 (dev, userid, IPMI_PASSWORD_OPERATION_TEST_PASSWORD, - password, + (char *)password, obj_cmd_rs) != 0) { if (IPMI_COMP_CODE (obj_cmd_rs) == IPMI_PASSWORD_OPERATION_TEST_FAILED) Index: fish/src/ipmi-wrapper.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/fish/src/ipmi-wrapper.c,v retrieving revision 1.23 diff -p -u -r1.23 ipmi-wrapper.c --- fish/src/ipmi-wrapper.c 4 Jan 2006 14:27:10 -0000 1.23 +++ fish/src/ipmi-wrapper.c 19 Jan 2006 13:35:40 -0000 @@ -219,20 +219,20 @@ get_channel_info_list () fiid_obj_get (data_rs, tmpl_get_channel_info_rs, - "actual_channel_number", + (uint8_t *)"actual_channel_number", &val); channel_info_list[ci].channel_number = (uint8_t) val; fiid_obj_get (data_rs, tmpl_get_channel_info_rs, - "channel_medium_type", + (uint8_t *)"channel_medium_type", &val); channel_info_list[ci].medium_type = channel_info_list[ci].actual_medium_type = (uint8_t) val; fiid_obj_get (data_rs, tmpl_get_channel_info_rs, - "channel_protocol_type", + (uint8_t *)"channel_protocol_type", &val); channel_info_list[ci].protocol_type = channel_info_list[ci].actual_protocol_type = (uint8_t) val; @@ -415,19 +415,19 @@ display_get_dev_id () FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "dev_id", + (uint8_t *)"dev_id", &val); fprintf (stdout, "Device ID: %X\n", (unsigned int) val); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "dev_rev.rev", + (uint8_t *)"dev_rev.rev", &val); fprintf (stdout, "Device Revision: %d\n", (unsigned int) val); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "dev_rev.sdr_support", + (uint8_t *)"dev_rev.sdr_support", &val); if (val) fprintf (stdout, " [SDR Support]\n"); @@ -436,11 +436,11 @@ display_get_dev_id () uint64_t maj, min; FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "firmware_rev1.major_rev", + (uint8_t *)"firmware_rev1.major_rev", &maj); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "firmware_rev2.minor_rev", + (uint8_t *)"firmware_rev2.minor_rev", &min); fprintf (stdout, "Firmware Revision: %d.%d\n", (unsigned int) maj, (unsigned int) min); @@ -448,7 +448,7 @@ display_get_dev_id () FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "firmware_rev1.dev_available", + (uint8_t *)"firmware_rev1.dev_available", &val); if (val == 0) fprintf (stdout, @@ -465,11 +465,11 @@ display_get_dev_id () uint64_t ms, ls; FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "ipmi_ver.ms_bits", + (uint8_t *)"ipmi_ver.ms_bits", &ms); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "ipmi_ver.ls_bits", + (uint8_t *)"ipmi_ver.ls_bits", &ls); fprintf (stdout, "IPMI Version: %d.%d\n", (unsigned int) ms, (unsigned int) ls); @@ -479,56 +479,56 @@ display_get_dev_id () FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.sensor_dev", + (uint8_t *)"additional_dev_support.sensor_dev", &val); if(val) fprintf (stdout, " [Sensor Device]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.sdr_repo_dev", + (uint8_t *)"additional_dev_support.sdr_repo_dev", &val); if(val) fprintf (stdout, " [SDR Repository Device]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.sel_dev", + (uint8_t *)"additional_dev_support.sel_dev", &val); if(val) fprintf (stdout, " [SEL Device]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.fru_inventory_dev", + (uint8_t *)"additional_dev_support.fru_inventory_dev", &val); if(val) fprintf (stdout, " [FRU Inventory Device]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.ipmb_evnt_receiver", + (uint8_t *)"additional_dev_support.ipmb_evnt_receiver", &val); if(val) fprintf (stdout, " [IPMB Event Receiver]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.ipmb_evnt_generator", + (uint8_t *)"additional_dev_support.ipmb_evnt_generator", &val); if(val) fprintf (stdout, " [IPMB Event Generator]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.bridge", + (uint8_t *)"additional_dev_support.bridge", &val); if(val) fprintf (stdout, " [Bridge]\n"); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.chassis_dev", + (uint8_t *)"additional_dev_support.chassis_dev", &val); if(val) fprintf (stdout, " [Chassis Device]\n"); @@ -536,13 +536,13 @@ display_get_dev_id () { uint64_t manf_id, prod_id; - FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, "manf_id.id", &manf_id); + FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, (uint8_t *)"manf_id.id", &manf_id); fprintf (stdout, "Manufacturer ID: %Xh\n", (unsigned int) manf_id); - FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, "prod_id", &prod_id); + FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, (uint8_t *)"prod_id", &prod_id); fprintf (stdout, "Product ID: %Xh\n", (unsigned int) prod_id); - FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, "aux_firmware_rev_info", &val); + FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_rs, (uint8_t *)"aux_firmware_rev_info", &val); switch (manf_id) { case IPMI_MANF_ID_INTEL: @@ -556,19 +556,19 @@ display_get_dev_id () uint64_t bc_maj, bc_min, pia_maj, pia_min; FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_sr870bn4_rs, - "aux_firmware_rev_info.boot_code.major", + (uint8_t *)"aux_firmware_rev_info.boot_code.major", &bc_maj); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_sr870bn4_rs, - "aux_firmware_rev_info.boot_code.minor", + (uint8_t *)"aux_firmware_rev_info.boot_code.minor", &bc_min); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_sr870bn4_rs, - "aux_firmware_rev_info.pia.major", + (uint8_t *)"aux_firmware_rev_info.pia.major", &pia_maj); FIID_OBJ_GET (cmd_rs, tmpl_cmd_get_dev_id_sr870bn4_rs, - "aux_firmware_rev_info.pia.minor", + (uint8_t *)"aux_firmware_rev_info.pia.minor", &pia_min); fprintf (stdout, "Aux Firmware Revision Info: Boot Code v%02x.%2x, PIA v%02x.%2x\n", Index: fish/src/scm-procedures.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/fish/src/scm-procedures.c,v retrieving revision 1.34 diff -p -u -r1.34 scm-procedures.c --- fish/src/scm-procedures.c 26 Dec 2005 08:06:57 -0000 1.34 +++ fish/src/scm-procedures.c 19 Jan 2006 13:35:42 -0000 @@ -262,7 +262,7 @@ ex_sel_get_first_entry_hex () fi_get_seld (), record_data, SEL_RECORD_SIZE) == 0) { - snprintf (hex_data, SEL_HEX_RECORD_SIZE, + snprintf ((char *)hex_data, SEL_HEX_RECORD_SIZE, "RID:[%02X][%02X] RT:[%02X] TS:[%02X][%02X][%02X][%02X] " "GID:[%02X][%02X] ER:[%02X] ST:[%02X] SN:[%02X] EDIR:[%02X] " "ED1: [%02X] ED2: [%02X] ED3: [%02X]\n", @@ -270,7 +270,7 @@ ex_sel_get_first_entry_hex () record_data[4], record_data[5], record_data[6], record_data[7], record_data[8], record_data[9], record_data[10], record_data[11], record_data[12], record_data[13], record_data[14], record_data[15]); - return gh_str02scm (hex_data); + return gh_str02scm ((char *)hex_data); } else return SCM_BOOL_F; } @@ -285,7 +285,7 @@ ex_sel_get_next_entry_hex () fi_get_seld (), record_data, SEL_RECORD_SIZE) == 0) { - snprintf (hex_data, SEL_HEX_RECORD_SIZE, + snprintf ((char *)hex_data, SEL_HEX_RECORD_SIZE, "RID:[%02X][%02X] RT:[%02X] TS:[%02X][%02X][%02X][%02X] " "GID:[%02X][%02X] ER:[%02X] ST:[%02X] SN:[%02X] EDIR:[%02X] " "ED1: [%02X] ED2: [%02X] ED3: [%02X]\n", @@ -293,7 +293,7 @@ ex_sel_get_next_entry_hex () record_data[4], record_data[5], record_data[6], record_data[7], record_data[8], record_data[9], record_data[10], record_data[11], record_data[12], record_data[13], record_data[14], record_data[15]); - return gh_str02scm (hex_data); + return gh_str02scm ((char *)hex_data); } else return SCM_BOOL_F; } @@ -426,7 +426,7 @@ ex_sel_delete_entry (SCM scm_record_id) fiid_obj_get (obj_cmd_rs, tmpl_reserve_sel_rs, - "reservation_id", + (uint8_t *)"reservation_id", &val); reservation_id = val; @@ -460,7 +460,7 @@ ex_sel_clear () fiid_obj_get (obj_cmd_rs, tmpl_reserve_sel_rs, - "reservation_id", + (uint8_t *)"reservation_id", &val); reservation_id = val; @@ -494,7 +494,7 @@ ex_sel_get_clear_status () fiid_obj_get (obj_cmd_rs, tmpl_reserve_sel_rs, - "reservation_id", + (uint8_t *)"reservation_id", &val); reservation_id = val; @@ -510,7 +510,7 @@ ex_sel_get_clear_status () fiid_obj_get (obj_cmd_rs, tmpl_clear_sel_rs, - "erasure_progress", + (uint8_t *)"erasure_progress", &val); return (gh_long2scm (val)); } @@ -526,7 +526,7 @@ ex_set_bmc_username (SCM scm_userid, SCM int retval; userid = gh_scm2long (scm_userid); - username = gh_scm2newstr (scm_username, NULL); + username = (uint8_t *)gh_scm2newstr (scm_username, NULL); retval = set_bmc_username (fi_get_ipmi_device (), userid, username); @@ -558,7 +558,7 @@ ex_set_bmc_user_password (SCM scm_userid int retval; userid = gh_scm2long (scm_userid); - password = gh_scm2newstr (scm_password, NULL); + password = (uint8_t *)gh_scm2newstr (scm_password, NULL); retval = set_bmc_user_password (fi_get_ipmi_device (), userid, password); @@ -1468,7 +1468,7 @@ ex_get_bmc_username (SCM scm_userid) userid = gh_scm2long (scm_userid); memset (username, 0, IPMI_SESSION_MAX_USERNAME_LEN+1); - if ((retval = get_bmc_username (fi_get_ipmi_device (), userid, username, IPMI_SESSION_MAX_USERNAME_LEN+1)) == 0) + if ((retval = get_bmc_username (fi_get_ipmi_device (), userid, (uint8_t *)username, IPMI_SESSION_MAX_USERNAME_LEN+1)) == 0) return_list = scm_listify (scm_makfrom0str (username), SCM_UNDEFINED); return (retval ? SCM_BOOL_F : return_list); @@ -2124,7 +2124,7 @@ ex_check_bmc_user_password (SCM scm_user int retval; userid = gh_scm2long (scm_userid); - password = gh_scm2newstr (scm_password, NULL); + password = (uint8_t *)gh_scm2newstr (scm_password, NULL); retval = check_bmc_user_password (fi_get_ipmi_device (), userid, password); @@ -2955,7 +2955,7 @@ ex_get_sdr_repo_info () fiid_obj_get (cmd_rs, tmpl_get_sdr_repo_info_rs, - "comp_code", + (uint8_t *)"comp_code", &val); if (val != 0) return SCM_EOL; @@ -2963,12 +2963,12 @@ ex_get_sdr_repo_info () /* appending sdr version */ fiid_obj_get (cmd_rs, tmpl_get_sdr_repo_info_rs, - "sdr_version_major", + (uint8_t *)"sdr_version_major", &val); sdr_major_version = val; fiid_obj_get (cmd_rs, tmpl_get_sdr_repo_info_rs, - "sdr_version_minor", + (uint8_t *)"sdr_version_minor", &val); sdr_minor_version = val; snprintf (version_string, 17, @@ -2980,7 +2980,7 @@ ex_get_sdr_repo_info () fiid_obj_get (cmd_rs, tmpl_get_sdr_repo_info_rs, - "record_count", + (uint8_t *)"record_count", &val); scm_repo_info_list = scm_assoc_set_x (scm_repo_info_list, gh_str02scm ("record_count"), @@ -2988,7 +2988,7 @@ ex_get_sdr_repo_info () fiid_obj_get (cmd_rs, tmpl_get_sdr_repo_info_rs, - "free_space", + (uint8_t *)"free_space", &val); scm_repo_info_list = scm_assoc_set_x (scm_repo_info_list, gh_str02scm ("free_space"), @@ -2996,7 +2996,7 @@ ex_get_sdr_repo_info () fiid_obj_get (cmd_rs, tmpl_get_sdr_repo_info_rs, - "recent_addition_timestamp", + (uint8_t *)"recent_addition_timestamp", &val); scm_repo_info_list = scm_assoc_set_x (scm_repo_info_list, gh_str02scm ("recent_addition_timestamp"), @@ -3004,7 +3004,7 @@ ex_get_sdr_repo_info () fiid_obj_get (cmd_rs, tmpl_get_sdr_repo_info_rs, - "recent_erase_timestamp", + (uint8_t *)"recent_erase_timestamp", &val); scm_repo_info_list = scm_assoc_set_x (scm_repo_info_list, gh_str02scm ("recent_erase_timestamp"), @@ -3029,7 +3029,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "dev_id", + (uint8_t *)"dev_id", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("dev_id"), @@ -3037,7 +3037,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "dev_rev.rev", + (uint8_t *)"dev_rev.rev", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("dev_revision"), @@ -3045,7 +3045,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "dev_rev.sdr_support", + (uint8_t *)"dev_rev.sdr_support", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("sdr_support"), @@ -3057,11 +3057,11 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "firmware_rev1.major_rev", + (uint8_t *)"firmware_rev1.major_rev", &major); fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "firmware_rev2.minor_rev", + (uint8_t *)"firmware_rev2.minor_rev", &minor); snprintf (version_string, 17, "%d.%d", @@ -3073,7 +3073,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "firmware_rev1.dev_available", + (uint8_t *)"firmware_rev1.dev_available", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("dev_availability"), @@ -3084,11 +3084,11 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "ipmi_ver.ms_bits", + (uint8_t *)"ipmi_ver.ms_bits", &major); fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "ipmi_ver.ls_bits", + (uint8_t *)"ipmi_ver.ls_bits", &minor); snprintf (version_string, 17, "%d.%d", @@ -3100,7 +3100,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.sensor_dev", + (uint8_t *)"additional_dev_support.sensor_dev", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("sensor_dev_support"), @@ -3108,7 +3108,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.sdr_repo_dev", + (uint8_t *)"additional_dev_support.sdr_repo_dev", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("sdr_repo_dev_support"), @@ -3116,7 +3116,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.sel_dev", + (uint8_t *)"additional_dev_support.sel_dev", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("sel_dev_support"), @@ -3124,7 +3124,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.fru_inventory_dev", + (uint8_t *)"additional_dev_support.fru_inventory_dev", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("fru_inventory_dev_support"), @@ -3132,7 +3132,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.ipmb_evnt_receiver", + (uint8_t *)"additional_dev_support.ipmb_evnt_receiver", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("ipmb_event_receiver_support"), @@ -3140,7 +3140,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.ipmb_evnt_generator", + (uint8_t *)"additional_dev_support.ipmb_evnt_generator", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("ipmb_event_generator_support"), @@ -3148,7 +3148,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.bridge", + (uint8_t *)"additional_dev_support.bridge", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("bridge_support"), @@ -3156,7 +3156,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "additional_dev_support.chassis_dev", + (uint8_t *)"additional_dev_support.chassis_dev", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("chassis_dev_support"), @@ -3164,7 +3164,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "manf_id.id", + (uint8_t *)"manf_id.id", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("manufacturer_id"), @@ -3172,7 +3172,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "prod_id", + (uint8_t *)"prod_id", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("product_id"), @@ -3180,7 +3180,7 @@ ex_get_bmc_info () fiid_obj_get (cmd_rs, tmpl_cmd_get_dev_id_rs, - "aux_firmware_rev_info", + (uint8_t *)"aux_firmware_rev_info", &val); scm_bmc_info_list = scm_assoc_set_x (scm_bmc_info_list, gh_str02scm ("aux_firmware_rev_info"), @@ -3302,12 +3302,12 @@ ex_get_pef_info () fiid_obj_get (cmd_rs, tmpl_get_pef_caps_rs, - "pef_version_major", + (uint8_t *)"pef_version_major", &val); pef_major_version = val; fiid_obj_get (cmd_rs, tmpl_get_pef_caps_rs, - "pef_version_minor", + (uint8_t *)"pef_version_minor", &val); pef_minor_version = val; snprintf (version_string, 17, @@ -3319,7 +3319,7 @@ ex_get_pef_info () fiid_obj_get (cmd_rs, tmpl_get_pef_caps_rs, - "action_support.alert", + (uint8_t *)"action_support.alert", &val); alert_support = val; scm_pef_info_list = scm_assoc_set_x (scm_pef_info_list, @@ -3328,7 +3328,7 @@ ex_get_pef_info () fiid_obj_get (cmd_rs, tmpl_get_pef_caps_rs, - "action_support.powerdown", + (uint8_t *)"action_support.powerdown", &val); scm_pef_info_list = scm_assoc_set_x (scm_pef_info_list, gh_str02scm ("powerdown_support"), @@ -3336,7 +3336,7 @@ ex_get_pef_info () fiid_obj_get (cmd_rs, tmpl_get_pef_caps_rs, - "action_support.reset", + (uint8_t *)"action_support.reset", &val); scm_pef_info_list = scm_assoc_set_x (scm_pef_info_list, gh_str02scm ("reset_support"), @@ -3344,7 +3344,7 @@ ex_get_pef_info () fiid_obj_get (cmd_rs, tmpl_get_pef_caps_rs, - "action_support.powercycle", + (uint8_t *)"action_support.powercycle", &val); scm_pef_info_list = scm_assoc_set_x (scm_pef_info_list, gh_str02scm ("powercycle_support"), @@ -3352,7 +3352,7 @@ ex_get_pef_info () fiid_obj_get (cmd_rs, tmpl_get_pef_caps_rs, - "action_support.oem", + (uint8_t *)"action_support.oem", &val); scm_pef_info_list = scm_assoc_set_x (scm_pef_info_list, gh_str02scm ("oem_support"), @@ -3360,7 +3360,7 @@ ex_get_pef_info () fiid_obj_get (cmd_rs, tmpl_get_pef_caps_rs, - "action_support.diag_interrupt", + (uint8_t *)"action_support.diag_interrupt", &val); scm_pef_info_list = scm_assoc_set_x (scm_pef_info_list, gh_str02scm ("diag_interrupt_support"), @@ -3368,7 +3368,7 @@ ex_get_pef_info () fiid_obj_get (cmd_rs, tmpl_get_pef_caps_rs, - "number_of_eft_entries", + (uint8_t *)"number_of_eft_entries", &val); scm_pef_info_list = scm_assoc_set_x (scm_pef_info_list, gh_str02scm ("eft_entries_count"), @@ -3388,7 +3388,7 @@ ex_get_pef_info () } fiid_obj_get (cmd_rs, tmpl_get_pef_conf_param_num_event_filters_rs, - "num_event_filters", + (uint8_t *)"num_event_filters", &val); } else @@ -3413,7 +3413,7 @@ ex_get_pef_info () } fiid_obj_get (cmd_rs, tmpl_get_pef_conf_param_num_alert_policies_rs, - "num_alert_policies", + (uint8_t *)"num_alert_policies", &val); } else @@ -3438,7 +3438,7 @@ ex_get_pef_info () } fiid_obj_get (cmd_rs, tmpl_get_pef_conf_param_num_alert_strings_rs, - "num_alert_strings", + (uint8_t *)"num_alert_strings", &val); } else Index: ipmi-locate/src/ipmi-locate.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmi-locate/src/ipmi-locate.c,v retrieving revision 1.4 diff -p -u -r1.4 ipmi-locate.c --- ipmi-locate/src/ipmi-locate.c 6 Jan 2006 01:42:51 -0000 1.4 +++ ipmi-locate/src/ipmi-locate.c 19 Jan 2006 13:35:42 -0000 @@ -82,13 +82,13 @@ display_ipmi_locate_info (ipmi_locate_in switch (info->addr_space_id) { case IPMI_ADDRESS_SPACE_ID_SYSTEM_MEMORY: - printf ("BMC memory base address: %lX\n", info->base_addr.bmc_membase_addr); + printf ("BMC memory base address: " FI_64 "X\n", info->base_addr.bmc_membase_addr); break; case IPMI_ADDRESS_SPACE_ID_SYSTEM_IO: - printf ("BMC I/O base address: %lX\n", info->base_addr.bmc_iobase_addr); + printf ("BMC I/O base address: " FI_64 "X\n", info->base_addr.bmc_iobase_addr); break; case IPMI_ADDRESS_SPACE_ID_SMBUS: - printf ("BMC SMBUS slave address: %lX\n", info->base_addr.bmc_smbus_slave_addr); + printf ("BMC SMBUS slave address: %lX\n", (unsigned long)info->base_addr.bmc_smbus_slave_addr); break; default: printf ("FATAL: error parsing base address\n"); Index: ipmi-raw/src/ipmi-raw.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmi-raw/src/ipmi-raw.c,v retrieving revision 1.8 diff -p -u -r1.8 ipmi-raw.c --- ipmi-raw/src/ipmi-raw.c 6 Jan 2006 01:42:51 -0000 1.8 +++ ipmi-raw/src/ipmi-raw.c 19 Jan 2006 13:35:42 -0000 @@ -47,7 +47,7 @@ string2bytes (char *line, unsigned char for (i = 0, count = 0; buf[i]; i++) { - if (strchr (delim, (int) buf[i])) + if (strchr ((const char *)delim, (int)buf[i])) count++; } count++; @@ -111,7 +111,7 @@ main (int argc, char **argv) int send_len; uint8_t bytes_rs[512]; - int rcvd_len; + size_t rcvd_len; struct rlimit resource_limit; Index: ipmiping/src/ipmiping.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmiping/src/ipmiping.c,v retrieving revision 1.7 diff -p -u -r1.7 ipmiping.c --- ipmiping/src/ipmiping.c 16 Dec 2005 08:48:40 -0000 1.7 +++ ipmiping/src/ipmiping.c 19 Jan 2006 13:35:42 -0000 @@ -238,7 +238,7 @@ parsepacket(char *buffer, } Fiid_obj_get(obj_msg_hdr, tmpl_lan_msg_hdr_rs, - "rq_seq", (uint64_t *)&req_seq); + (uint8_t *)"rq_seq", (uint64_t *)&req_seq); if (req_seq != seq_num % (IPMI_RQ_SEQ_MAX + 1)) { @@ -250,30 +250,30 @@ parsepacket(char *buffer, if (verbose) { Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.none", (uint64_t *)&none); + (uint8_t *)"auth_type.none", (uint64_t *)&none); Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.md2", (uint64_t *)&md2); + (uint8_t *)"auth_type.md2", (uint64_t *)&md2); Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.md5", (uint64_t *)&md5); + (uint8_t *)"auth_type.md5", (uint64_t *)&md5); Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.straight_passwd_key", + (uint8_t *)"auth_type.straight_passwd_key", (uint64_t *)&straight_passwd_key); Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.oem_prop", (uint64_t *)&oem); + (uint8_t *)"auth_type.oem_prop", (uint64_t *)&oem); Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_status.anonymous_login", + (uint8_t *)"auth_status.anonymous_login", (uint64_t *)&anonymous_login); Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_status.null_username", + (uint8_t *)"auth_status.null_username", (uint64_t *)&null_username); Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_status.non_null_username", + (uint8_t *)"auth_status.non_null_username", (uint64_t *)&non_null_username); Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_status.user_level_auth", + (uint8_t *)"auth_status.user_level_auth", (uint64_t *)&user_level_auth); Fiid_obj_get(obj_cmd, tmpl_cmd_get_channel_auth_caps_rs, - "auth_status.per_message_auth", + (uint8_t *)"auth_status.per_message_auth", (uint64_t *)&per_message_auth); printf(", auth: none=%s md2=%s md5=%s passwd=%s oem=%s anon=%s null=%s non-null=%s user=%s permsg=%s ", _setstr(none), _setstr(md2), _setstr(md5), Index: ipmipower/src/ipmipower_check.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmipower/src/ipmipower_check.c,v retrieving revision 1.8 diff -p -u -r1.8 ipmipower_check.c --- ipmipower/src/ipmipower_check.c 16 Dec 2005 08:48:40 -0000 1.8 +++ ipmipower/src/ipmipower_check.c 19 Jan 2006 13:35:42 -0000 @@ -66,7 +66,7 @@ _check_outbound_seq_num(ipmipower_powerc return 1; Fiid_obj_get(ip->session_res, tmpl_hdr_session_auth_calc, - "session_seq_num", &pktoseq); + (uint8_t *)"session_seq_num", &pktoseq); if (pkt == ACTV_RES) { @@ -176,9 +176,9 @@ _check_session_id(ipmipower_powercmd_t i else { Fiid_obj_get(ip->session_res, tmpl_hdr_session_auth_calc, - "session_id", &session_id); + (uint8_t *)"session_id", &session_id); Fiid_obj_get(ip->actv_res, tmpl_cmd_activate_session_rs, - "session_id", &actv_res_session_id); + (uint8_t *)"session_id", &actv_res_session_id); } /* IPMI Workaround (achu) @@ -208,7 +208,7 @@ _check_network_function(ipmipower_powerc assert(ip != NULL); assert(PACKET_TYPE_VALID_RES(pkt)); - Fiid_obj_get(ip->msg_res, tmpl_lan_msg_hdr_rs, "net_fn", &netfn); + Fiid_obj_get(ip->msg_res, tmpl_lan_msg_hdr_rs, (uint8_t *)"net_fn", &netfn); if (pkt == CHAS_RES || pkt == CTRL_RES) expected_netfn = IPMI_NET_FN_CHASSIS_RS; @@ -233,7 +233,7 @@ _check_requester_seq_num(ipmipower_power myrseq = ip->ic->ipmi_requester_seq_num_counter % (IPMIPOWER_RSEQ_MAX + 1); - Fiid_obj_get(ip->msg_res, tmpl_lan_msg_hdr_rs, "rq_seq", &pktrseq); + Fiid_obj_get(ip->msg_res, tmpl_lan_msg_hdr_rs, (uint8_t *)"rq_seq", &pktrseq); if (pktrseq != myrseq) dbg("_check_requester_seq_num(%s:%d): rseq: %d, expected: %d", @@ -253,7 +253,7 @@ _check_command(ipmipower_powercmd_t ip, Fiid_obj_get(ipmipower_packet_cmd_obj(ip, pkt), ipmipower_packet_cmd_template(ip, pkt), - "cmd", &cmd); + (uint8_t *)"cmd", &cmd); if (pkt == AUTH_RES) expected_cmd = IPMI_CMD_GET_CHANNEL_AUTH_CAPS; @@ -287,7 +287,7 @@ _check_completion_code(ipmipower_powercm Fiid_obj_get(ipmipower_packet_cmd_obj(ip, pkt), ipmipower_packet_cmd_template(ip, pkt), - "comp_code", &cc); + (uint8_t *)"comp_code", &cc); if (cc != IPMI_COMMAND_SUCCESS) dbg("_check_completion_code(%s:%d): cc bad: %x", Index: ipmipower/src/ipmipower_connection.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmipower/src/ipmipower_connection.c,v retrieving revision 1.5 diff -p -u -r1.5 ipmipower_connection.c --- ipmipower/src/ipmipower_connection.c 16 Dec 2005 08:48:40 -0000 1.5 +++ ipmipower/src/ipmipower_connection.c 19 Jan 2006 13:35:42 -0000 @@ -75,7 +75,7 @@ _clean_fd(int fd) if (ufds.revents & POLLIN) { - rv = Recvfrom(fd, buffer, IPMI_PACKET_BUFLEN, 0, NULL, NULL); + rv = Recvfrom(fd, (uint8_t *)buffer, IPMI_PACKET_BUFLEN, 0, NULL, NULL); if (rv == 0) break; } Index: ipmipower/src/ipmipower_packet.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmipower/src/ipmipower_packet.c,v retrieving revision 1.12 diff -p -u -r1.12 ipmipower_packet.c --- ipmipower/src/ipmipower_packet.c 16 Dec 2005 08:48:40 -0000 1.12 +++ ipmipower/src/ipmipower_packet.c 19 Jan 2006 13:35:43 -0000 @@ -43,6 +43,9 @@ extern struct ipmipower_config *conf; +int8_t fill_cmd_get_chassis_status (fiid_obj_t obj_cmd); +int8_t fill_cmd_chassis_ctrl (uint8_t chassis_ctrl, fiid_obj_t obj_cmd); + /* fiid_template_t */ const fiid_field_t * ipmipower_packet_cmd_template(ipmipower_powercmd_t ip, packet_type_t pkt) @@ -242,7 +245,7 @@ ipmipower_packet_store(ipmipower_powercm Fiid_obj_memset(ip->trlr_res, '\0', tmpl_lan_msg_trlr); Fiid_obj_memset(obj, '\0', ipmipower_packet_cmd_template(ip, pkt)); - if (unassemble_ipmi_lan_pkt(buffer, len, tmpl_hdr_session_auth_calc, ipmipower_packet_cmd_template(ip, pkt), ip->rmcp_res, ip->session_res, ip->msg_res, ipmipower_packet_cmd_obj(ip, pkt), ip->trlr_res) < 0) + if (unassemble_ipmi_lan_pkt((uint8_t *)buffer, len, tmpl_hdr_session_auth_calc, ipmipower_packet_cmd_template(ip, pkt), ip->rmcp_res, ip->session_res, ip->msg_res, ipmipower_packet_cmd_obj(ip, pkt), ip->trlr_res) < 0) err_exit("ipmipower_packet_store: unassemble_ipmi_lan_pkt: %s", strerror(errno)); } @@ -293,7 +296,7 @@ ipmipower_packet_create(ipmipower_powerc if ((len = assemble_ipmi_lan_pkt(ip->rmcp_req, ip->session_req, tmpl_hdr_session_auth_calc, ip->msg_req, ip->auth_req, tmpl_cmd_get_channel_auth_caps_rq, - buffer, buflen)) < 0) + (uint8_t *)buffer, buflen)) < 0) err_exit("ipmipower_packet_create(%s: %d): " "assemble_ipmi_lan_pkt: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -321,7 +324,7 @@ ipmipower_packet_create(ipmipower_powerc username = NULL; if (fill_cmd_get_session_challenge(ip->authtype, - username, + (char *)username, strlen(conf->username), ip->sess_req) < 0) err_exit("ipmipower_packet_create(%s: %d): " @@ -331,7 +334,7 @@ ipmipower_packet_create(ipmipower_powerc if ((len = assemble_ipmi_lan_pkt(ip->rmcp_req, ip->session_req, tmpl_hdr_session_auth_calc, ip->msg_req, ip->sess_req, tmpl_cmd_get_session_challenge_rq, - buffer, buflen)) < 0) + (uint8_t *)buffer, buflen)) < 0) err_exit("ipmipower_packet_create(%s: %d): " "assemble_ipmi_lan_pkt: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -347,7 +350,7 @@ ipmipower_packet_create(ipmipower_powerc password = NULL; Fiid_obj_get(ip->sess_res, tmpl_cmd_get_session_challenge_rs, - "tmp_session_id", &tmp_session_id); + (uint8_t *)"tmp_session_id", &tmp_session_id); if (fill_hdr_session(tmpl_hdr_session_auth_calc, ip->authtype, 0, @@ -365,8 +368,8 @@ ipmipower_packet_create(ipmipower_powerc ip->ic->hostname, ip->protocol_state, strerror(errno)); if (fill_cmd_activate_session(ip->authtype, ip->privilege, - ip->sess_res + fiid_obj_field_start_bytes(tmpl_cmd_get_session_challenge_rs, "challenge_str"), - fiid_obj_field_len_bytes(tmpl_cmd_get_session_challenge_rs, "challenge_str"), + ip->sess_res + fiid_obj_field_start_bytes(tmpl_cmd_get_session_challenge_rs, (uint8_t *)"challenge_str"), + fiid_obj_field_len_bytes(tmpl_cmd_get_session_challenge_rs, (uint8_t *)"challenge_str"), ip->initial_outbound_seq_num, ip->actv_req) < 0) err_exit("ipmipower_packet_create(%s: %d): " @@ -376,7 +379,7 @@ ipmipower_packet_create(ipmipower_powerc if ((len = assemble_ipmi_lan_pkt(ip->rmcp_req, ip->session_req, tmpl_hdr_session_auth_calc, ip->msg_req, ip->actv_req, tmpl_cmd_activate_session_rq, - buffer, buflen)) < 0) + (uint8_t *)buffer, buflen)) < 0) err_exit("ipmipower_packet_create(%s: %d): " "assemble_ipmi_lan_pkt: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -418,9 +421,9 @@ ipmipower_packet_create(ipmipower_powerc priv = IPMI_PRIV_LEVEL_OPERATOR; Fiid_obj_get(ip->actv_res, tmpl_cmd_activate_session_rs, - "initial_inbound_seq_num", &initial_inbound_seq_num); + (uint8_t *)"initial_inbound_seq_num", &initial_inbound_seq_num); Fiid_obj_get(ip->actv_res, tmpl_cmd_activate_session_rs, - "session_id", &session_id); + (uint8_t *)"session_id", &session_id); if (fill_hdr_session(tmpl_hdr_session_auth_calc, at, initial_inbound_seq_num + ip->session_inbound_count, @@ -446,7 +449,7 @@ ipmipower_packet_create(ipmipower_powerc if ((len = assemble_ipmi_lan_pkt(ip->rmcp_req, ip->session_req, tmpl_hdr_session_auth_calc, ip->msg_req, ip->priv_req, tmpl_cmd_set_session_priv_level_rq, - buffer, buflen)) < 0) + (uint8_t *)buffer, buflen)) < 0) err_exit("ipmipower_packet_create(%s: %d): " "assemble_ipmi_lan_pkt: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -473,9 +476,9 @@ ipmipower_packet_create(ipmipower_powerc password = NULL; Fiid_obj_get(ip->actv_res, tmpl_cmd_activate_session_rs, - "initial_inbound_seq_num", &initial_inbound_seq_num); + (uint8_t *)"initial_inbound_seq_num", &initial_inbound_seq_num); Fiid_obj_get(ip->actv_res, tmpl_cmd_activate_session_rs, - "session_id", &session_id); + (uint8_t *)"session_id", &session_id); if (fill_hdr_session(tmpl_hdr_session_auth_calc, at, initial_inbound_seq_num + ip->session_inbound_count, @@ -501,7 +504,7 @@ ipmipower_packet_create(ipmipower_powerc if ((len = assemble_ipmi_lan_pkt(ip->rmcp_req, ip->session_req, tmpl_hdr_session_auth_calc, ip->msg_req, ip->clos_req, tmpl_cmd_close_session_rq, - buffer, buflen)) < 0) + (uint8_t *)buffer, buflen)) < 0) err_exit("ipmipower_packet_create(%s: %d): " "assemble_ipmi_lan_pkt: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -528,9 +531,9 @@ ipmipower_packet_create(ipmipower_powerc password = NULL; Fiid_obj_get(ip->actv_res, tmpl_cmd_activate_session_rs, - "initial_inbound_seq_num", &initial_inbound_seq_num); + (uint8_t *)"initial_inbound_seq_num", &initial_inbound_seq_num); Fiid_obj_get(ip->actv_res, tmpl_cmd_activate_session_rs, - "session_id", &session_id); + (uint8_t *)"session_id", &session_id); if (fill_hdr_session(tmpl_hdr_session_auth_calc, at, initial_inbound_seq_num + ip->session_inbound_count, @@ -556,7 +559,7 @@ ipmipower_packet_create(ipmipower_powerc if ((len = assemble_ipmi_lan_pkt(ip->rmcp_req, ip->session_req, tmpl_hdr_session_auth_calc, ip->msg_req, ip->chas_req, tmpl_cmd_get_chassis_status_rq, - buffer, buflen)) < 0) + (uint8_t *)buffer, buflen)) < 0) err_exit("ipmipower_packet_create(%s: %d): " "assemble_ipmi_lan_pkt: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -604,9 +607,9 @@ ipmipower_packet_create(ipmipower_powerc command = IPMI_CHASSIS_CTRL_INIT_SOFT_SHUTDOWN; Fiid_obj_get(ip->actv_res, tmpl_cmd_activate_session_rs, - "initial_inbound_seq_num", &initial_inbound_seq_num); + (uint8_t *)"initial_inbound_seq_num", &initial_inbound_seq_num); Fiid_obj_get(ip->actv_res, tmpl_cmd_activate_session_rs, - "session_id", &session_id); + (uint8_t *)"session_id", &session_id); if (fill_hdr_session(tmpl_hdr_session_auth_calc, at, initial_inbound_seq_num + ip->session_inbound_count, @@ -632,7 +635,7 @@ ipmipower_packet_create(ipmipower_powerc if ((len = assemble_ipmi_lan_pkt(ip->rmcp_req, ip->session_req, tmpl_hdr_session_auth_calc, ip->msg_req, ip->ctrl_req, tmpl_cmd_chassis_ctrl_rq, - buffer, buflen)) < 0) + (uint8_t *)buffer, buflen)) < 0) err_exit("ipmipower_packet_create(%s: %d): " "assemble_ipmi_lan_pkt: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -659,15 +662,15 @@ ipmipower_packet_response_data(ipmipower obj = ipmipower_packet_cmd_obj(ip, pkt); Fiid_obj_get(ip->session_res, tmpl_hdr_session_auth_calc, - "session_seq_num", &sseq); + (uint8_t *)"session_seq_num", &sseq); Fiid_obj_get(ip->session_res, tmpl_hdr_session_auth_calc, - "session_id", &sid); + (uint8_t *)"session_id", &sid); Fiid_obj_get(ip->msg_res, tmpl_lan_msg_hdr_rs, - "net_fn", &netfn); + (uint8_t *)"net_fn", &netfn); Fiid_obj_get(ip->msg_res, tmpl_lan_msg_hdr_rs, - "rq_seq", &rseq); - Fiid_obj_get(obj, ipmipower_packet_cmd_template(ip, pkt), "cmd", &cmd); - Fiid_obj_get(obj, ipmipower_packet_cmd_template(ip, pkt), "comp_code", &cc); + (uint8_t *)"rq_seq", &rseq); + Fiid_obj_get(obj, ipmipower_packet_cmd_template(ip, pkt), (uint8_t *)"cmd", &cmd); + Fiid_obj_get(obj, ipmipower_packet_cmd_template(ip, pkt), (uint8_t *)"comp_code", &cc); if (session_seq_num) *session_seq_num = sseq; Index: ipmipower/src/ipmipower_ping.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmipower/src/ipmipower_ping.c,v retrieving revision 1.4 diff -p -u -r1.4 ipmipower_ping.c --- ipmipower/src/ipmipower_ping.c 16 Dec 2005 08:48:40 -0000 1.4 +++ ipmipower/src/ipmipower_ping.c 19 Jan 2006 13:35:43 -0000 @@ -132,7 +132,7 @@ ipmipower_ping_process_pings(int *timeou if ((len = assemble_rmcp_pkt(rmcp_hdr, rmcp_ping, tmpl_cmd_asf_presence_ping, - buffer, RMCP_PACKET_BUFLEN)) < 0) + (uint8_t *)buffer, RMCP_PACKET_BUFLEN)) < 0) err_exit("assemble_rmcp_pkt: %s", strerror(errno)); #ifndef NDEBUG @@ -202,11 +202,11 @@ ipmipower_ping_process_pings(int *timeou */ if (fiid_obj_get(rmcp_pong, tmpl_cmd_asf_presence_pong, - "msg_type", &msg_type) < 0) + (uint8_t *)"msg_type", &msg_type) < 0) err_exit("fiid_obj_get: %s", strerror(errno)); if (fiid_obj_get(rmcp_pong, tmpl_cmd_asf_presence_pong, - "supported_entities.ipmi_supported", &ipmi_supported) < 0) + (uint8_t *)"supported_entities.ipmi_supported", &ipmi_supported) < 0) err_exit("fiid_obj_get: %s", strerror(errno)); Index: ipmipower/src/ipmipower_powercmd.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmipower/src/ipmipower_powercmd.c,v retrieving revision 1.16 diff -p -u -r1.16 ipmipower_powercmd.c --- ipmipower/src/ipmipower_powercmd.c 16 Dec 2005 08:48:40 -0000 1.16 +++ ipmipower/src/ipmipower_powercmd.c 19 Jan 2006 13:35:44 -0000 @@ -328,7 +328,7 @@ _recv_packet(ipmipower_powercmd_t ip, pa ipmipower_packet_dump(ip, pkt, buffer, len); - if ((ret = ipmi_lan_check_chksum(buffer, len)) < 0) + if ((ret = ipmi_lan_check_chksum((uint8_t *)buffer, len)) < 0) err_exit("_recv_packet(%s:%d): ipmi_lan_check_chksum: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -364,10 +364,10 @@ _recv_packet(ipmipower_powercmd_t ip, pa else password = NULL; - if ((ret = check_hdr_session_authcode(buffer, len, + if ((ret = check_hdr_session_authcode((uint8_t *)buffer, len, tmpl_hdr_session_auth_calc, at, - password, + (uint8_t *)password, strlen(conf->password))) < 0) err_exit("_recv_packet(%s:%d): check_hdr_session_authcode: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -399,10 +399,10 @@ _recv_packet(ipmipower_powercmd_t ip, pa else password = NULL; - if ((ret = check_hdr_session_authcode(buffer, len, + if ((ret = check_hdr_session_authcode((uint8_t *)buffer, len, tmpl_hdr_session_auth_calc, at, - password, + (uint8_t *)password, strlen(conf->password))) < 0) err_exit("_recv_packet(%s:%d): check_hdr_session_authcode: %s", ip->ic->hostname, ip->protocol_state, strerror(errno)); @@ -648,22 +648,22 @@ _process_ipmi_packets(ipmipower_powercmd */ Fiid_obj_get(ip->auth_res, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.none", &auth_type_none); + (uint8_t *)"auth_type.none", &auth_type_none); Fiid_obj_get(ip->auth_res, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.md2", &auth_type_md2); + (uint8_t *)"auth_type.md2", &auth_type_md2); Fiid_obj_get(ip->auth_res, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.md5", &auth_type_md5); + (uint8_t *)"auth_type.md5", &auth_type_md5); Fiid_obj_get(ip->auth_res, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.straight_passwd_key", &auth_type_straight_passwd_key); + (uint8_t *)"auth_type.straight_passwd_key", &auth_type_straight_passwd_key); Fiid_obj_get(ip->auth_res, tmpl_cmd_get_channel_auth_caps_rs, - "auth_status.anonymous_login", &auth_status_anonymous_login); + (uint8_t *)"auth_status.anonymous_login", &auth_status_anonymous_login); Fiid_obj_get(ip->auth_res, tmpl_cmd_get_channel_auth_caps_rs, - "auth_status.null_username", &auth_status_null_username); + (uint8_t *)"auth_status.null_username", &auth_status_null_username); Fiid_obj_get(ip->auth_res, tmpl_cmd_get_channel_auth_caps_rs, - "auth_status.non_null_username", &auth_status_non_null_username); + (uint8_t *)"auth_status.non_null_username", &auth_status_non_null_username); Fiid_obj_get(ip->auth_res, tmpl_cmd_get_channel_auth_caps_rs, - "auth_status.per_message_auth", &auth_status_per_message_auth); + (uint8_t *)"auth_status.per_message_auth", &auth_status_per_message_auth); /* Does the remote BMC's authentication configuration support * our username/password combination @@ -863,7 +863,7 @@ _process_ipmi_packets(ipmipower_powercmd Fiid_obj_get(ip->chas_res, tmpl_cmd_get_chassis_status_rs, - "power_state.power_on", + (uint8_t *)"power_state.power_on", &power_state); if (ip->cmd == POWER_CMD_POWER_STATUS) Index: ipmipower/src/ipmipower_prompt.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmipower/src/ipmipower_prompt.c,v retrieving revision 1.9 diff -p -u -r1.9 ipmipower_prompt.c --- ipmipower/src/ipmipower_prompt.c 16 Dec 2005 08:48:40 -0000 1.9 +++ ipmipower/src/ipmipower_prompt.c 19 Jan 2006 13:35:44 -0000 @@ -664,7 +664,7 @@ ipmipower_prompt_process_cmdline(void) unsigned char *buf; int quit = 0; - buf = Malloc(IPMIPOWER_MAX_TTY_BUF); + buf = (unsigned char *)Malloc(IPMIPOWER_MAX_TTY_BUF); do { if (ipmipower_powercmd_pending()) @@ -675,10 +675,10 @@ ipmipower_prompt_process_cmdline(void) need_prompt = 0; } buf[0] = '\0'; - _readcmd(buf, IPMIPOWER_MAX_TTY_BUF); - if (strlen(buf) > 0) + _readcmd((char *)buf, IPMIPOWER_MAX_TTY_BUF); + if (strlen((char *)buf) > 0) { - char **argv = argv_create(buf, ""); + char **argv = argv_create((char *)buf, ""); int i; if (argv[0] != NULL) { @@ -792,7 +792,7 @@ ipmipower_prompt_process_cmdline(void) argv_destroy(argv); } - } while (!quit && strlen(buf) > 0); + } while (!quit && strlen((char *)buf) > 0); Free(buf); return !quit; Index: ipmipower/src/wrappers.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/ipmipower/src/wrappers.c,v retrieving revision 1.4 diff -p -u -r1.4 wrappers.c --- ipmipower/src/wrappers.c 16 Dec 2005 08:48:40 -0000 1.4 +++ ipmipower/src/wrappers.c 19 Jan 2006 13:35:45 -0000 @@ -222,7 +222,7 @@ Select(int maxfd, fd_set * rset, fd_set struct timeval *tv) { int n; - struct timeval tv_orig; + struct timeval tv_orig = { 0, }; struct timeval start, end, delta; /* prep for EINTR handling */ @@ -638,7 +638,7 @@ int Poll(struct pollfd *ufds, unsigned int nfds, int timeout) { int n; - struct timeval tv, tv_orig; + struct timeval tv, tv_orig = { 0, }; struct timeval start, end, delta; /* prep for EINTR handling */ Index: libfreeipmi/src/acpi-spmi-locate.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/acpi-spmi-locate.c,v retrieving revision 1.9 diff -p -u -r1.9 acpi-spmi-locate.c --- libfreeipmi/src/acpi-spmi-locate.c 16 Dec 2005 08:48:40 -0000 1.9 +++ libfreeipmi/src/acpi-spmi-locate.c 19 Jan 2006 13:35:45 -0000 @@ -452,7 +452,7 @@ ipmi_acpi_get_rsdp (uint64_t rsdp_window for (i = 0; i < rsdp_window_size; i += IPMI_ACPI_RSDP_SCAN_STEP) { /* check RSDP signature */ - if (strncmp (&memdata[i], + if (strncmp ((char *)&memdata[i], IPMI_ACPI_RSDP_SIG, strlen (IPMI_ACPI_RSDP_SIG)) != 0) continue; @@ -473,18 +473,18 @@ ipmi_acpi_get_rsdp (uint64_t rsdp_window uint32_t rsdt_xsdt_table_length; fiid_obj_get (obj_acpi_rsdp_descriptor, tmpl_acpi_rsdp_descriptor, - "revision", &val); + (uint8_t *)"revision", &val); revision = val; if (revision < 2) { fiid_obj_get (obj_acpi_rsdp_descriptor, tmpl_acpi_rsdp_descriptor, - "rsdt_physical_address", &rsdt_xsdt_address); + (uint8_t *)"rsdt_physical_address", &rsdt_xsdt_address); rsdt_xsdt_signature = strdupa (IPMI_ACPI_RSDT_SIG); } else { fiid_obj_get (obj_acpi_rsdp_descriptor, tmpl_acpi_rsdp_descriptor, - "xsdt_physical_address", &rsdt_xsdt_address); + (uint8_t *)"xsdt_physical_address", &rsdt_xsdt_address); rsdt_xsdt_signature = strdupa (IPMI_ACPI_XSDT_SIG); } @@ -500,7 +500,7 @@ ipmi_acpi_get_rsdp (uint64_t rsdp_window /* This is special case because of EFI */ fiid_obj_get (obj_acpi_rsdp_descriptor, tmpl_acpi_rsdp_descriptor, - "rsdt_physical_address", &rsdt_xsdt_address); + (uint8_t *)"rsdt_physical_address", &rsdt_xsdt_address); memdata = alloca (acpi_rsdp_descriptor_len); memset (memdata, 0, acpi_rsdp_descriptor_len); if (ipmi_get_physical_mem_data (rsdt_xsdt_address, @@ -509,7 +509,7 @@ ipmi_acpi_get_rsdp (uint64_t rsdp_window return (-1); /* check RSDP signature */ - if (strncmp (memdata, + if (strncmp ((char *)memdata, IPMI_ACPI_RSDP_SIG, strlen (IPMI_ACPI_RSDP_SIG)) != 0) return (-1); @@ -548,7 +548,7 @@ ipmi_acpi_get_table (uint64_t table_addr return (-1); table_signature_length = fiid_obj_field_len_bytes (tmpl_acpi_table_hdr, - "signature") + 1; + (uint8_t *)"signature") + 1; table_signature = alloca (table_signature_length); memset (table_signature, 0, table_signature_length); @@ -562,12 +562,12 @@ ipmi_acpi_get_table (uint64_t table_addr return (-1); fiid_obj_get_data (obj_acpi_table_hdr, tmpl_acpi_table_hdr, - "signature", table_signature, table_signature_length); + (uint8_t *)"signature", (uint8_t *)table_signature, table_signature_length); if (strcmp (table_signature, signature) != 0) return (-1); fiid_obj_get (obj_acpi_table_hdr, tmpl_acpi_table_hdr, - "length", &val); + (uint8_t *)"length", &val); table_length = val; table = alloca (table_length); @@ -634,18 +634,18 @@ ipmi_acpi_get_firmware_table (char *sign } fiid_obj_get (obj_acpi_rsdp_descriptor, tmpl_acpi_rsdp_descriptor, - "revision", &val); + (uint8_t *)"revision", &val); revision = val; if (revision < 2) { fiid_obj_get (obj_acpi_rsdp_descriptor, tmpl_acpi_rsdp_descriptor, - "rsdt_physical_address", &rsdt_xsdt_address); + (uint8_t *)"rsdt_physical_address", &rsdt_xsdt_address); rsdt_xsdt_signature = strdupa (IPMI_ACPI_RSDT_SIG); } else { fiid_obj_get (obj_acpi_rsdp_descriptor, tmpl_acpi_rsdp_descriptor, - "xsdt_physical_address", &rsdt_xsdt_address); + (uint8_t *)"xsdt_physical_address", &rsdt_xsdt_address); rsdt_xsdt_signature = strdupa (IPMI_ACPI_XSDT_SIG); } @@ -676,7 +676,7 @@ ipmi_acpi_get_firmware_table (char *sign fiid_obj_get ((rsdt_xsdt_table_data + (i * 4)), tmpl_table_address, - "table_address", + (uint8_t *)"table_address", &table_address); } else @@ -689,7 +689,7 @@ ipmi_acpi_get_firmware_table (char *sign fiid_obj_get ((rsdt_xsdt_table_data + (i * 8)), tmpl_table_address, - "table_address", + (uint8_t *)"table_address", &table_address); } @@ -768,7 +768,7 @@ ipmi_acpi_get_spmi_table (uint8_t interf fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, - "interface_type", &val); + (uint8_t *)"interface_type", &val); table_interface_type = val; if (table_interface_type == interface_type) return (0); @@ -818,7 +818,7 @@ acpi_spmi_get_dev_info (ipmi_interface_t /* { uint64_t ipmi_legacy; - fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, "ipmi_legacy", &ipmi_legacy); + fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, (uint8_t *)"ipmi_legacy", &ipmi_legacy); if (ipmi_legacy != 1) { errno = ENODEV; @@ -830,15 +830,15 @@ acpi_spmi_get_dev_info (ipmi_interface_t /* IPMI version */ { uint64_t ipmi_ver_maj, ipmi_ver_min; - fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, "specification_revision.major", &ipmi_ver_maj); - fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, "specification_revision.minor", &ipmi_ver_min); + fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, (uint8_t *)"specification_revision.major", &ipmi_ver_maj); + fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, (uint8_t *)"specification_revision.minor", &ipmi_ver_min); pinfo->ipmi_ver_major = ipmi_ver_maj; pinfo->ipmi_ver_minor = ipmi_ver_min; } /* Interface type - KCS, SMIC, SSIF, BT */ { uint64_t interface_type; - fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, "interface_type", &interface_type); + fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, (uint8_t *)"interface_type", &interface_type); switch (interface_type) { case IPMI_INTERFACE_KCS: @@ -865,9 +865,9 @@ acpi_spmi_get_dev_info (ipmi_interface_t uint64_t addr_space_id; uint64_t base_addr; - fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, "base_address.address_space_id", &addr_space_id); + fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, (uint8_t *)"base_address.address_space_id", &addr_space_id); - fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, "base_address.address", &base_addr); + fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, (uint8_t *)"base_address.address", &base_addr); switch (addr_space_id) { @@ -902,7 +902,7 @@ acpi_spmi_get_dev_info (ipmi_interface_t /* Register spacing */ { uint64_t reg_bit_width; - fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, "base_address.register_bit_width", ®_bit_width); + fiid_obj_get (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor, (uint8_t *)"base_address.register_bit_width", ®_bit_width); pinfo->reg_space = (reg_bit_width / 8); } Index: libfreeipmi/src/fiid.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/fiid.c,v retrieving revision 1.9 diff -p -u -r1.9 fiid.c --- libfreeipmi/src/fiid.c 16 Dec 2005 08:48:40 -0000 1.9 +++ libfreeipmi/src/fiid.c 19 Jan 2006 13:35:46 -0000 @@ -68,7 +68,7 @@ fiid_obj_field_start_end (fiid_template_ for (i = 0; tmpl[i].len != 0; i++) { - if (strcmp (tmpl[i].key, field) == 0) + if (strcmp (tmpl[i].key, (char *)field) == 0) { _end = _start + tmpl[i].len; key_index = i; @@ -93,8 +93,8 @@ int8_t fiid_obj_field_lookup (fiid_template_t tmpl, uint8_t *field) { - int start = 0; - int end = 0; //excluded always + uint32_t start = 0; + uint32_t end = 0; //excluded always if (fiid_obj_field_start_end (tmpl, field, &start, &end) != -1) return (1); @@ -106,8 +106,8 @@ int32_t fiid_obj_field_start (fiid_template_t tmpl, uint8_t *field) { - int start = 0; - int end = 0; //excluded always + uint32_t start = 0; + uint32_t end = 0; //excluded always ERR (fiid_obj_field_start_end (tmpl, field, &start, &end) != -1); return (start); @@ -128,8 +128,8 @@ int32_t fiid_obj_field_end (fiid_template_t tmpl, uint8_t *field) { - int start = 0; - int end = 0; //excluded always + uint32_t start = 0; + uint32_t end = 0; //excluded always ERR (fiid_obj_field_start_end (tmpl, field, &start, &end) != -1); return (end); @@ -160,7 +160,7 @@ fiid_obj_field_len (fiid_template_t tmpl for (i=0; tmpl[i].len != 0; i++) { - if (strcmp (tmpl[i].key, field) == 0) + if (strcmp (tmpl[i].key, (char *)field) == 0) return (tmpl[i].len); } @@ -282,8 +282,8 @@ fiid_obj_set (fiid_obj_t obj, uint8_t *field, uint64_t val) { - int start_bit_pos = 0; - int end_bit_pos = 0; //excluded always + uint32_t start_bit_pos = 0; + uint32_t end_bit_pos = 0; //excluded always int byte_pos = 0; int start_bit_in_byte_pos = 0; int end_bit_in_byte_pos = 0; @@ -366,8 +366,8 @@ fiid_obj_get (fiid_obj_t obj, uint8_t *field, uint64_t *val) { - int start_bit_pos = 0; - int end_bit_pos = 0; //excluded always + uint32_t start_bit_pos = 0; + uint32_t end_bit_pos = 0; //excluded always int byte_pos = 0; int start_bit_in_byte_pos = 0; int end_bit_in_byte_pos = 0; Index: libfreeipmi/src/freeipmi.h =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/freeipmi.h,v retrieving revision 1.18 diff -p -u -r1.18 freeipmi.h --- libfreeipmi/src/freeipmi.h 16 Dec 2005 08:48:40 -0000 1.18 +++ libfreeipmi/src/freeipmi.h 19 Jan 2006 13:35:46 -0000 @@ -184,6 +184,12 @@ extern "C" { # include "xmalloc.h" #endif +#if __WORDSIZE == 64 +#define FI_64 "%l" +#else +#define FI_64 "%ll" +#endif + #if defined (FREEIPMI_BUILD) #include "bit-ops.h" #include "fiid.h" Index: libfreeipmi/src/ipmi-chassis-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-chassis-cmds.c,v retrieving revision 1.9 diff -p -u -r1.9 ipmi-chassis-cmds.c --- libfreeipmi/src/ipmi-chassis-cmds.c 11 Jan 2006 19:38:01 -0000 1.9 +++ libfreeipmi/src/ipmi-chassis-cmds.c 19 Jan 2006 13:35:46 -0000 @@ -130,12 +130,12 @@ fill_cmd_set_power_restore_policy (fiid_ { FIID_OBJ_SET (obj_data_rq, tmpl_set_power_restore_policy_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_POWER_RESTORE_POLICY); FIID_OBJ_SET (obj_data_rq, tmpl_set_power_restore_policy_rq, - "power_restore_policy", + (uint8_t *)"power_restore_policy", power_restore_policy); return 0; @@ -150,7 +150,7 @@ fill_cmd_get_chassis_status (fiid_obj_t return -1; } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_chassis_status_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_chassis_status_rq, (uint8_t *)"cmd", IPMI_CMD_GET_CHASSIS_STATUS); return 0; } @@ -165,9 +165,9 @@ fill_cmd_chassis_ctrl (uint8_t chassis_c return -1; } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_chassis_ctrl_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_chassis_ctrl_rq, (uint8_t *)"cmd", IPMI_CMD_CHASSIS_CTRL); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_chassis_ctrl_rq, "chassis_ctrl", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_chassis_ctrl_rq, (uint8_t *)"chassis_ctrl", chassis_ctrl); return 0; } @@ -240,14 +240,14 @@ fill_cmd_chassis_identify (fiid_template return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_identify_cmd, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_identify_cmd, (uint8_t *)"cmd", IPMI_CMD_CHASSIS_IDENTIFY); - if (fiid_obj_field_lookup(tmpl_identify_cmd, "identify_interval")) + if (fiid_obj_field_lookup(tmpl_identify_cmd, (uint8_t *)"identify_interval")) FIID_OBJ_SET (obj_cmd, tmpl_identify_cmd, - "identify_interval", identify_interval); - if (fiid_obj_field_lookup(tmpl_identify_cmd, "force_identify")) + (uint8_t *)"identify_interval", identify_interval); + if (fiid_obj_field_lookup(tmpl_identify_cmd, (uint8_t *)"force_identify")) FIID_OBJ_SET (obj_cmd, tmpl_identify_cmd, - "force_identify", force_identify_flag); + (uint8_t *)"force_identify", force_identify_flag); return 0; } Index: libfreeipmi/src/ipmi-debug.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-debug.c,v retrieving revision 1.10 diff -p -u -r1.10 ipmi-debug.c --- libfreeipmi/src/ipmi-debug.c 27 Dec 2005 21:27:45 -0000 1.10 +++ libfreeipmi/src/ipmi-debug.c 19 Jan 2006 13:35:46 -0000 @@ -177,7 +177,7 @@ fiid_obj_dump_perror (int fd, char *pref { if (tmpl[i].len <= 64) { - FIID_OBJ_GET (obj, tmpl, (char *) tmpl[i].key, &val); + FIID_OBJ_GET (obj, tmpl,(uint8_t *)tmpl[i].key, &val); if (prefix) _DPRINTF ((fd, "%s[%16LXh] = %s[%2db]\n", prefix, (uint64_t) val, tmpl[i].key, tmpl[i].len)); else @@ -191,7 +191,7 @@ fiid_obj_dump_perror (int fd, char *pref _DPRINTF ((fd, "[ BYTE ARRAY ... ] = %s[%2dB]\n", tmpl[i].key, BITS_ROUND_BYTES(tmpl[i].len))); _output_byte_array(fd, prefix, - obj + fiid_obj_field_start_bytes(tmpl, (char *) tmpl[i].key), + obj + fiid_obj_field_start_bytes(tmpl, (uint8_t *) tmpl[i].key), BITS_ROUND_BYTES(tmpl[i].len)); } } @@ -269,7 +269,7 @@ fiid_obj_dump_lan (int fd, char *prefix, /* Dump session header */ /* Output of session header depends on the auth code */ - if ((pkt_len - indx) < fiid_obj_field_end_bytes (tmpl_session, "auth_type")) + if ((pkt_len - indx) < fiid_obj_field_end_bytes (tmpl_session, (uint8_t *)"auth_type")) { ERR_EXIT(fiid_obj_len_bytes(tmpl_session) < IPMI_DEBUG_MAX_PKT_LEN); memset(buf, '\0', IPMI_DEBUG_MAX_PKT_LEN); @@ -281,12 +281,12 @@ fiid_obj_dump_lan (int fd, char *prefix, uint8_t auth_type; uint32_t auth_type_offset; - auth_type_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_session, "auth_type"); + auth_type_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_session, (uint8_t *)"auth_type"); auth_type = pkt[auth_type_offset]; if (auth_type == IPMI_SESSION_AUTH_TYPE_NONE) tmpl_session = tmpl_hdr_session; - else if (fiid_obj_field_lookup(tmpl_session, "auth_calc_data")) + else if (fiid_obj_field_lookup(tmpl_session, (uint8_t *)"auth_calc_data")) tmpl_session = tmpl_hdr_session_auth; if ((pkt_len - indx) < fiid_obj_len_bytes (tmpl_session)) Index: libfreeipmi/src/ipmi-dev-global-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-dev-global-cmds.c,v retrieving revision 1.12 diff -p -u -r1.12 ipmi-dev-global-cmds.c --- libfreeipmi/src/ipmi-dev-global-cmds.c 7 Jan 2006 03:24:32 -0000 1.12 +++ libfreeipmi/src/ipmi-dev-global-cmds.c 19 Jan 2006 13:35:46 -0000 @@ -88,7 +88,7 @@ fiid_template_t tmpl_cmd_get_dev_id_sr87 int8_t fill_cmd_get_dev_id (fiid_obj_t obj_data_rq) { - FIID_OBJ_SET (obj_data_rq, tmpl_cmd_get_dev_id_rq, "cmd", IPMI_CMD_GET_DEV_ID); + FIID_OBJ_SET (obj_data_rq, tmpl_cmd_get_dev_id_rq, (uint8_t *)"cmd", IPMI_CMD_GET_DEV_ID); return (0); } Index: libfreeipmi/src/ipmi-kcs-interface.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-kcs-interface.c,v retrieving revision 1.22 diff -p -u -r1.22 ipmi-kcs-interface.c --- libfreeipmi/src/ipmi-kcs-interface.c 12 Jan 2006 14:34:44 -0000 1.22 +++ libfreeipmi/src/ipmi-kcs-interface.c 19 Jan 2006 13:35:47 -0000 @@ -70,8 +70,8 @@ fill_hdr_ipmi_kcs (uint8_t lun, return (-1); } - FIID_OBJ_SET (obj_hdr, tmpl_hdr_kcs, "lun", lun); - FIID_OBJ_SET (obj_hdr, tmpl_hdr_kcs, "net_fn", fn); + FIID_OBJ_SET (obj_hdr, tmpl_hdr_kcs, (uint8_t *)"lun", lun); + FIID_OBJ_SET (obj_hdr, tmpl_hdr_kcs, (uint8_t *)"net_fn", fn); return 0; } Index: libfreeipmi/src/ipmi-lan-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-lan-cmds.c,v retrieving revision 1.12 diff -p -u -r1.12 ipmi-lan-cmds.c --- libfreeipmi/src/ipmi-lan-cmds.c 11 Jan 2006 19:38:01 -0000 1.12 +++ libfreeipmi/src/ipmi-lan-cmds.c 19 Jan 2006 13:35:47 -0000 @@ -434,27 +434,27 @@ fill_lan_set_arp (fiid_obj_t obj_data_rq FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_bmc_generated_arp_control_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_bmc_generated_arp_control_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_bmc_generated_arp_control_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_LAN_PARAM_BMC_GENERATED_ARP_CONTROL); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_bmc_generated_arp_control_rq, - "bmc_generated_gratuitous_arps_flag", + (uint8_t *)"bmc_generated_gratuitous_arps_flag", bmc_generated_gratuitous_arps_flag); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_bmc_generated_arp_control_rq, - "bmc_generated_arp_responses_flag", + (uint8_t *)"bmc_generated_arp_responses_flag", bmc_generated_arp_responses_flag); return 0; @@ -474,22 +474,22 @@ fill_lan_set_gratuitous_arp_interval (fi FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_gratuitous_arp_interval_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_gratuitous_arp_interval_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_gratuitous_arp_interval_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_LAN_PARAM_GRATUITOUS_ARP_INTERVAL); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_gratuitous_arp_interval_rq, - "gratuitous_arp_interval", + (uint8_t *)"gratuitous_arp_interval", gratuitous_arp_interval); return 0; @@ -513,42 +513,42 @@ fill_lan_set_auth_type_enables (fiid_obj FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_auth_type_enables_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_auth_type_enables_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_auth_type_enables_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_LAN_PARAM_AUTH_TYPE_ENABLES); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_auth_type_enables_rq, - "max_privilege_auth_type_callback_level", + (uint8_t *)"max_privilege_auth_type_callback_level", max_privilege_auth_type_callback_level); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_auth_type_enables_rq, - "max_privilege_auth_type_user_level", + (uint8_t *)"max_privilege_auth_type_user_level", max_privilege_auth_type_user_level); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_auth_type_enables_rq, - "max_privilege_auth_type_operator_level", + (uint8_t *)"max_privilege_auth_type_operator_level", max_privilege_auth_type_operator_level); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_auth_type_enables_rq, - "max_privilege_auth_type_admin_level", + (uint8_t *)"max_privilege_auth_type_admin_level", max_privilege_auth_type_admin_level); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_auth_type_enables_rq, - "max_privilege_auth_type_oem_level", + (uint8_t *)"max_privilege_auth_type_oem_level", max_privilege_auth_type_oem_level); return 0; @@ -568,22 +568,22 @@ fill_lan_set_ip_addr_source (fiid_obj_t FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_ip_addr_source_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_ip_addr_source_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_ip_addr_source_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_LAN_PARAM_IP_ADDR_SOURCE); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_ip_addr_source_rq, - "ip_addr_source", + (uint8_t *)"ip_addr_source", ip_addr_source); return 0; @@ -604,22 +604,22 @@ fill_lan_set_ip_addr (fiid_obj_t obj_dat FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_ip_addr_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_ip_addr_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_ip_addr_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", parameter_selector); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_ip_addr_rq, - "ip_addr", + (uint8_t *)"ip_addr", ip_addr); return 0; @@ -642,22 +642,22 @@ fill_lan_set_vlan_id (fiid_obj_t obj_dat FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_id_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_id_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_id_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_LAN_PARAM_VLAN_ID); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_id_rq, - "vlan_id_flag", + (uint8_t *)"vlan_id_flag", vlan_id_flag); ptr = (uint8_t *)&vlan_id; @@ -671,12 +671,12 @@ fill_lan_set_vlan_id (fiid_obj_t obj_dat FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_id_rq, - "vlan_id_ls", + (uint8_t *)"vlan_id_ls", ls); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_id_rq, - "vlan_id_ms", + (uint8_t *)"vlan_id_ms", ms); return 0; @@ -696,22 +696,22 @@ fill_lan_set_vlan_priority (fiid_obj_t o FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_priority_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_priority_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_priority_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_LAN_PARAM_VLAN_PRIORITY); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_vlan_priority_rq, - "vlan_priority", + (uint8_t *)"vlan_priority", vlan_priority); return 0; @@ -731,22 +731,22 @@ fill_lan_set_subnet_mask (fiid_obj_t obj FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_subnet_mask_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_subnet_mask_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_subnet_mask_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_LAN_PARAM_SUBNET_MASK); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_subnet_mask_rq, - "subnet_mask", + (uint8_t *)"subnet_mask", subnet_mask); return 0; @@ -767,22 +767,22 @@ fill_lan_set_mac_addr (fiid_obj_t obj_da FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_mac_addr_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_mac_addr_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_mac_addr_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", parameter_selector); FIID_OBJ_SET (obj_data_rq, tmpl_set_lan_conf_param_mac_addr_rq, - "mac_addr", + (uint8_t *)"mac_addr", mac_addr); return 0; @@ -805,32 +805,32 @@ fill_get_lan_conf_param (fiid_obj_t obj_ FIID_OBJ_SET (obj_data_rq, tmpl_get_lan_conf_param_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_LAN_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_get_lan_conf_param_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_get_lan_conf_param_rq, - "parameter_type", + (uint8_t *)"parameter_type", parameter_type); FIID_OBJ_SET (obj_data_rq, tmpl_get_lan_conf_param_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", parameter_selector); FIID_OBJ_SET (obj_data_rq, tmpl_get_lan_conf_param_rq, - "set_selector", + (uint8_t *)"set_selector", set_selector); FIID_OBJ_SET (obj_data_rq, tmpl_get_lan_conf_param_rq, - "block_selector", + (uint8_t *)"block_selector", block_selector); return 0; @@ -851,22 +851,22 @@ fill_suspend_bmc_arps (fiid_obj_t obj_da FIID_OBJ_SET (obj_data_rq, tmpl_suspend_bmc_arps_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SUSPEND_BMC_ARPS); FIID_OBJ_SET (obj_data_rq, tmpl_suspend_bmc_arps_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_suspend_bmc_arps_rq, - "gratuitous_arp_suspend", + (uint8_t *)"gratuitous_arp_suspend", gratuitous_arp_suspend); FIID_OBJ_SET (obj_data_rq, tmpl_suspend_bmc_arps_rq, - "arp_response_suspend", + (uint8_t *)"arp_response_suspend", arp_response_suspend); return 0; Index: libfreeipmi/src/ipmi-lan-interface.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-lan-interface.c,v retrieving revision 1.22 diff -p -u -r1.22 ipmi-lan-interface.c --- libfreeipmi/src/ipmi-lan-interface.c 3 Jan 2006 22:03:31 -0000 1.22 +++ libfreeipmi/src/ipmi-lan-interface.c 19 Jan 2006 13:35:48 -0000 @@ -92,7 +92,7 @@ get_rq_checksum2 (ipmi_device_t *dev, if (fiid_obj_get (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "rq_addr", + (uint8_t *)"rq_addr", &val) == -1) { free (tmpl_var_checksum2_data); @@ -100,7 +100,7 @@ get_rq_checksum2 (ipmi_device_t *dev, } if (fiid_obj_set (var_checksum2_data, tmpl_var_checksum2_data, - "rq_addr", + (uint8_t *)"rq_addr", val) == -1) { free (tmpl_var_checksum2_data); @@ -109,7 +109,7 @@ get_rq_checksum2 (ipmi_device_t *dev, if (fiid_obj_get (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "rq_lun", + (uint8_t *)"rq_lun", &val) == -1) { free (tmpl_var_checksum2_data); @@ -117,7 +117,7 @@ get_rq_checksum2 (ipmi_device_t *dev, } if (fiid_obj_set (var_checksum2_data, tmpl_var_checksum2_data, - "rq_lun", + (uint8_t *)"rq_lun", val) == -1) { free (tmpl_var_checksum2_data); @@ -126,7 +126,7 @@ get_rq_checksum2 (ipmi_device_t *dev, if (fiid_obj_get (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "rq_seq", + (uint8_t *)"rq_seq", &val) == -1) { free (tmpl_var_checksum2_data); @@ -134,7 +134,7 @@ get_rq_checksum2 (ipmi_device_t *dev, } if (fiid_obj_set (var_checksum2_data, tmpl_var_checksum2_data, - "rq_seq", + (uint8_t *)"rq_seq", val) == -1) { free (tmpl_var_checksum2_data); @@ -143,7 +143,7 @@ get_rq_checksum2 (ipmi_device_t *dev, if (fiid_obj_set_data (var_checksum2_data, tmpl_var_checksum2_data, - "COMMAND_DATA", + (uint8_t *)"COMMAND_DATA", obj_cmd, cmd_length) == -1) { @@ -182,7 +182,7 @@ get_rs_checksum2 (ipmi_device_t *dev, if (fiid_obj_get (dev->io.outofband.rs.obj_msg_hdr, *(dev->io.outofband.rs.tmpl_msg_hdr_ptr), - "rs_addr", + (uint8_t *)"rs_addr", &val) == -1) { free (tmpl_var_checksum2_data); @@ -190,7 +190,7 @@ get_rs_checksum2 (ipmi_device_t *dev, } if (fiid_obj_set (var_checksum2_data, tmpl_var_checksum2_data, - "rs_addr", + (uint8_t *)"rs_addr", val) == -1) { free (tmpl_var_checksum2_data); @@ -199,7 +199,7 @@ get_rs_checksum2 (ipmi_device_t *dev, if (fiid_obj_get (dev->io.outofband.rs.obj_msg_hdr, *(dev->io.outofband.rs.tmpl_msg_hdr_ptr), - "rs_lun", + (uint8_t *)"rs_lun", &val) == -1) { free (tmpl_var_checksum2_data); @@ -207,7 +207,7 @@ get_rs_checksum2 (ipmi_device_t *dev, } if (fiid_obj_set (var_checksum2_data, tmpl_var_checksum2_data, - "rs_lun", + (uint8_t *)"rs_lun", val) == -1) { free (tmpl_var_checksum2_data); @@ -216,7 +216,7 @@ get_rs_checksum2 (ipmi_device_t *dev, if (fiid_obj_get (dev->io.outofband.rs.obj_msg_hdr, *(dev->io.outofband.rs.tmpl_msg_hdr_ptr), - "rq_seq", + (uint8_t *)"rq_seq", &val) == -1) { free (tmpl_var_checksum2_data); @@ -224,7 +224,7 @@ get_rs_checksum2 (ipmi_device_t *dev, } if (fiid_obj_set (var_checksum2_data, tmpl_var_checksum2_data, - "rq_seq", + (uint8_t *)"rq_seq", val) == -1) { free (tmpl_var_checksum2_data); @@ -233,7 +233,7 @@ get_rs_checksum2 (ipmi_device_t *dev, if (fiid_obj_set_data (var_checksum2_data, tmpl_var_checksum2_data, - "COMMAND_DATA", + (uint8_t *)"COMMAND_DATA", obj_cmd, cmd_length) == -1) { @@ -263,14 +263,14 @@ fill_lan_msg_hdr (uint8_t net_fn, return -1; } - FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, "rs_addr", IPMI_SLAVE_ADDR_BMC); - FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, "net_fn", net_fn); - FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, "rs_lun", rs_lun); - FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, "chksum1", + FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, (uint8_t *)"rs_addr", IPMI_SLAVE_ADDR_BMC); + FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, (uint8_t *)"net_fn", net_fn); + FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, (uint8_t *)"rs_lun", rs_lun); + FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, (uint8_t *)"chksum1", ipmi_chksum (obj_msg, IPMI_LAN_PKT_RQ_CHKSUM1_BLOCK_LEN)); - FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, "rq_addr", IPMI_SLAVE_ADDR_SWID); - FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, "rq_lun", IPMI_BMC_IPMB_LUN_BMC); - FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, "rq_seq", rq_seq); + FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, (uint8_t *)"rq_addr", IPMI_SLAVE_ADDR_SWID); + FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, (uint8_t *)"rq_lun", IPMI_BMC_IPMB_LUN_BMC); + FIID_OBJ_SET (obj_msg, tmpl_lan_msg_hdr_rq, (uint8_t *)"rq_seq", rq_seq); return (0); } @@ -287,32 +287,32 @@ fill_lan_msg_hdr2 (ipmi_device_t *dev) FIID_OBJ_SET (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "rs_addr", + (uint8_t *)"rs_addr", IPMI_SLAVE_ADDR_BMC); FIID_OBJ_SET (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "rs_lun", + (uint8_t *)"rs_lun", dev->lun); FIID_OBJ_SET (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "net_fn", + (uint8_t *)"net_fn", dev->net_fn); get_rq_checksum1 (dev, &checksum); FIID_OBJ_SET (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "chksum1", + (uint8_t *)"chksum1", checksum); FIID_OBJ_SET (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "rq_addr", + (uint8_t *)"rq_addr", IPMI_SLAVE_ADDR_SWID); FIID_OBJ_SET (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "rq_lun", + (uint8_t *)"rq_lun", IPMI_BMC_IPMB_LUN_BMC); FIID_OBJ_SET (dev->io.outofband.rq.obj_msg_hdr, *(dev->io.outofband.rq.tmpl_msg_hdr_ptr), - "rq_seq", + (uint8_t *)"rq_seq", dev->io.outofband.rq_seq); return (0); @@ -332,7 +332,7 @@ fill_lan_msg_trlr2 (ipmi_device_t *dev, FIID_OBJ_SET (dev->io.outofband.rq.obj_msg_trlr, *(dev->io.outofband.rq.tmpl_msg_trlr_ptr), - "chksum2", + (uint8_t *)"chksum2", checksum); return (0); @@ -355,15 +355,15 @@ fill_hdr_session2 (ipmi_device_t *dev, FIID_OBJ_SET (dev->io.outofband.rq.obj_hdr_session, *(dev->io.outofband.rq.tmpl_hdr_session_ptr), - "auth_type", + (uint8_t *)"auth_type", dev->io.outofband.auth_type); FIID_OBJ_SET (dev->io.outofband.rq.obj_hdr_session, *(dev->io.outofband.rq.tmpl_hdr_session_ptr), - "session_seq_num", + (uint8_t *)"session_seq_num", dev->io.outofband.session_seq_num); FIID_OBJ_SET (dev->io.outofband.rq.obj_hdr_session, *(dev->io.outofband.rq.tmpl_hdr_session_ptr), - "session_id", + (uint8_t *)"session_id", dev->io.outofband.session_id); switch (dev->io.outofband.auth_type) @@ -378,7 +378,7 @@ fill_hdr_session2 (ipmi_device_t *dev, */ ERR (fiid_obj_set_data (dev->io.outofband.rq.obj_hdr_session, *(dev->io.outofband.rq.tmpl_hdr_session_ptr), - "auth_code", + (uint8_t *)"auth_code", dev->io.outofband.password, IPMI_SESSION_MAX_AUTH_CODE_LEN) != -1); break; @@ -418,7 +418,7 @@ fill_hdr_session2 (ipmi_device_t *dev, } ERR (fiid_obj_set_data (dev->io.outofband.rq.obj_hdr_session, *(dev->io.outofband.rq.tmpl_hdr_session_ptr), - "auth_code", + (uint8_t *)"auth_code", auth_code, auth_code_length) != -1); break; @@ -458,7 +458,7 @@ fill_hdr_session2 (ipmi_device_t *dev, } ERR (fiid_obj_set_data (dev->io.outofband.rq.obj_hdr_session, *(dev->io.outofband.rq.tmpl_hdr_session_ptr), - "auth_code", + (uint8_t *)"auth_code", auth_code, auth_code_length) != -1); break; @@ -472,7 +472,7 @@ fill_hdr_session2 (ipmi_device_t *dev, FIID_OBJ_SET (dev->io.outofband.rq.obj_hdr_session, *(dev->io.outofband.rq.tmpl_hdr_session_ptr), - "ipmi_msg_len", + (uint8_t *)"ipmi_msg_len", (fiid_obj_len_bytes (*(dev->io.outofband.rq.tmpl_msg_hdr_ptr)) + fiid_obj_len_bytes (tmpl_cmd) + fiid_obj_len_bytes (*(dev->io.outofband.rq.tmpl_msg_trlr_ptr)))); @@ -579,16 +579,16 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_hd return -1; } - if (!fiid_obj_field_lookup(tmpl_hdr_session, "auth_type") - || !fiid_obj_field_lookup(tmpl_hdr_session, "session_seq_num") - || !fiid_obj_field_lookup(tmpl_hdr_session, "session_id") - || !fiid_obj_field_lookup(tmpl_hdr_session, "ipmi_msg_len")) + if (!fiid_obj_field_lookup(tmpl_hdr_session, (uint8_t *)"auth_type") + || !fiid_obj_field_lookup(tmpl_hdr_session, (uint8_t *)"session_seq_num") + || !fiid_obj_field_lookup(tmpl_hdr_session, (uint8_t *)"session_id") + || !fiid_obj_field_lookup(tmpl_hdr_session, (uint8_t *)"ipmi_msg_len")) { errno = EINVAL; return -1; } - fiid_obj_get(obj_hdr_session, tmpl_hdr_session, "auth_type", &auth_type); + fiid_obj_get(obj_hdr_session, tmpl_hdr_session, (uint8_t *)"auth_type", &auth_type); if (!IPMI_SESSION_AUTH_TYPE_VALID(auth_type)) { errno = EINVAL; @@ -609,21 +609,21 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_hd memcpy (pkt, obj_hdr_rmcp, obj_len); indx += obj_len; - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_type"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_type"); memcpy (pkt + indx, - obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, "auth_type"), + obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"auth_type"), obj_len); indx += obj_len; - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "session_seq_num"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"session_seq_num"); memcpy (pkt + indx, - obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, "session_seq_num"), + obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"session_seq_num"), obj_len); indx += obj_len; - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "session_id"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"session_id"); memcpy (pkt + indx, - obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, "session_id"), + obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"session_id"), obj_len); indx += obj_len; @@ -637,9 +637,9 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_hd indx += IPMI_SESSION_MAX_AUTH_CODE_LEN; } - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "ipmi_msg_len"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"ipmi_msg_len"); memcpy (pkt + indx, - obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, "ipmi_msg_len"), + obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"ipmi_msg_len"), obj_len); indx += obj_len; @@ -670,22 +670,22 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_hd || auth_type == IPMI_SESSION_AUTH_TYPE_STRAIGHT_PASSWD_KEY || auth_type == IPMI_SESSION_AUTH_TYPE_OEM_PROP) { - if (fiid_obj_field_lookup (tmpl_hdr_session, "auth_code")) + if (fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"auth_code")) { - ERR_EXIT(fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_code") == IPMI_SESSION_MAX_AUTH_CODE_LEN); + ERR_EXIT(fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_code") == IPMI_SESSION_MAX_AUTH_CODE_LEN); memcpy (auth_code_field_ptr, - obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, "auth_code"), - fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_code")); + obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"auth_code"), + fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_code")); } - else if (fiid_obj_field_lookup (tmpl_hdr_session, "auth_calc_data")) + else if (fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"auth_calc_data")) { if (auth_type == IPMI_SESSION_AUTH_TYPE_STRAIGHT_PASSWD_KEY) { - ERR_EXIT(fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_calc_data") >= IPMI_SESSION_MAX_AUTH_CODE_LEN); + ERR_EXIT(fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_calc_data") >= IPMI_SESSION_MAX_AUTH_CODE_LEN); /* achu: Do not copy based on field length of "auth_calc_data" */ memcpy (auth_code_field_ptr, - obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, "auth_calc_data"), + obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"auth_calc_data"), IPMI_SESSION_MAX_AUTH_CODE_LEN); } else if (auth_type == IPMI_SESSION_AUTH_TYPE_MD2 @@ -693,7 +693,7 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_hd { uint8_t pwbuf[IPMI_SESSION_MAX_AUTH_CODE_LEN]; - ERR_EXIT(fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_calc_data") >= IPMI_SESSION_MAX_AUTH_CODE_LEN); + ERR_EXIT(fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_calc_data") >= IPMI_SESSION_MAX_AUTH_CODE_LEN); ERR_EXIT(IPMI_SESSION_MAX_AUTH_CODE_LEN == IPMI_MD2_DIGEST_LEN); /* Must zero extend password. No null termination is required. @@ -704,7 +704,7 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_hd memcpy(pwbuf, (obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, - "auth_calc_data")), + (uint8_t *)"auth_calc_data")), IPMI_SESSION_MAX_AUTH_CODE_LEN); if (auth_type == IPMI_SESSION_AUTH_TYPE_MD2) @@ -717,16 +717,16 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_hd ipmi_md2_update_data(&ctx, (obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, - "session_id")), + (uint8_t *)"session_id")), fiid_obj_field_len_bytes (tmpl_hdr_session, - "session_id")); + (uint8_t *)"session_id")); ipmi_md2_update_data(&ctx, msg_data_ptr, msg_data_count); ipmi_md2_update_data(&ctx, (obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, - "session_seq_num")), + (uint8_t *)"session_seq_num")), fiid_obj_field_len_bytes (tmpl_hdr_session, - "session_seq_num")); + (uint8_t *)"session_seq_num")); ipmi_md2_update_data(&ctx, pwbuf, IPMI_SESSION_MAX_AUTH_CODE_LEN); ipmi_md2_finish(&ctx, digest, IPMI_MD2_DIGEST_LEN); @@ -742,16 +742,16 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_hd ipmi_md5_update_data(&ctx, (obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, - "session_id")), + (uint8_t *)"session_id")), fiid_obj_field_len_bytes (tmpl_hdr_session, - "session_id")); + (uint8_t *)"session_id")); ipmi_md5_update_data(&ctx, msg_data_ptr, msg_data_count); ipmi_md5_update_data(&ctx, (obj_hdr_session + fiid_obj_field_start_bytes (tmpl_hdr_session, - "session_seq_num")), + (uint8_t *)"session_seq_num")), fiid_obj_field_len_bytes (tmpl_hdr_session, - "session_seq_num")); + (uint8_t *)"session_seq_num")); ipmi_md5_update_data(&ctx, pwbuf, IPMI_SESSION_MAX_AUTH_CODE_LEN); ipmi_md5_finish(&ctx, digest, IPMI_MD5_DIGEST_LEN); @@ -871,10 +871,10 @@ unassemble_ipmi_lan_pkt (uint8_t *pkt, return -1; } - if (!fiid_obj_field_lookup(tmpl_hdr_session, "auth_type") - || !fiid_obj_field_lookup(tmpl_hdr_session, "session_seq_num") - || !fiid_obj_field_lookup(tmpl_hdr_session, "session_id") - || !fiid_obj_field_lookup(tmpl_hdr_session, "ipmi_msg_len")) + if (!fiid_obj_field_lookup(tmpl_hdr_session, (uint8_t *)"auth_type") + || !fiid_obj_field_lookup(tmpl_hdr_session, (uint8_t *)"session_seq_num") + || !fiid_obj_field_lookup(tmpl_hdr_session, (uint8_t *)"session_id") + || !fiid_obj_field_lookup(tmpl_hdr_session, (uint8_t *)"ipmi_msg_len")) { errno = EINVAL; return -1; @@ -892,21 +892,21 @@ unassemble_ipmi_lan_pkt (uint8_t *pkt, if (pkt_len <= indx) return 0; - if ((pkt_len - indx) < fiid_obj_field_end_bytes (tmpl_hdr_session, "auth_type")) + if ((pkt_len - indx) < fiid_obj_field_end_bytes (tmpl_hdr_session, (uint8_t *)"auth_type")) { /* Special case, return after copying this */ memcpy(obj_hdr_session, pkt + indx, (pkt_len - indx)); return 0; } - auth_type_offset = obj_rmcp_hdr_len + fiid_obj_field_start_bytes (tmpl_hdr_session, "auth_type"); + auth_type_offset = obj_rmcp_hdr_len + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"auth_type"); auth_type = pkt[auth_type_offset]; if (obj_hdr_session) { - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_type"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_type"); memcpy (obj_hdr_session + - fiid_obj_field_start_bytes (tmpl_hdr_session, "auth_type"), + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"auth_type"), pkt + indx, FREEIPMI_MIN ((pkt_len - indx), obj_len)); indx += obj_len; @@ -914,9 +914,9 @@ unassemble_ipmi_lan_pkt (uint8_t *pkt, if (pkt_len <= indx) return 0; - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "session_seq_num"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"session_seq_num"); memcpy (obj_hdr_session + - fiid_obj_field_start_bytes (tmpl_hdr_session, "session_seq_num"), + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"session_seq_num"), pkt + indx, FREEIPMI_MIN ((pkt_len - indx), obj_len)); indx += obj_len; @@ -924,9 +924,9 @@ unassemble_ipmi_lan_pkt (uint8_t *pkt, if (pkt_len <= indx) return 0; - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "session_id"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"session_id"); memcpy (obj_hdr_session + - fiid_obj_field_start_bytes (tmpl_hdr_session, "session_id"), + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"session_id"), pkt + indx, FREEIPMI_MIN ((pkt_len - indx), obj_len)); indx += obj_len; @@ -936,26 +936,26 @@ unassemble_ipmi_lan_pkt (uint8_t *pkt, if (auth_type != IPMI_SESSION_AUTH_TYPE_NONE) { - if (fiid_obj_field_lookup (tmpl_hdr_session, "auth_code")) + if (fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"auth_code")) { - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_code"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_code"); ERR_EXIT(obj_len == IPMI_SESSION_MAX_AUTH_CODE_LEN); memcpy (obj_hdr_session + - fiid_obj_field_start_bytes (tmpl_hdr_session, "auth_code"), + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"auth_code"), pkt + indx, FREEIPMI_MIN ((pkt_len - indx), obj_len)); indx += obj_len; } - else if (fiid_obj_field_lookup (tmpl_hdr_session, "auth_calc_data")) + else if (fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"auth_calc_data")) { - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_calc_data"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_calc_data"); ERR_EXIT(obj_len >= IPMI_SESSION_MAX_AUTH_CODE_LEN); /* Must copy IPMI_SESSION_MAX_AUTH_CODE_LEN, auth_calc_data may be > IPMI_SESSION_MAX_AUTH_CODE_LEN */ memcpy (obj_hdr_session + - fiid_obj_field_start_bytes (tmpl_hdr_session, "auth_calc_data"), + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"auth_calc_data"), pkt + indx, FREEIPMI_MIN ((pkt_len - indx), IPMI_SESSION_MAX_AUTH_CODE_LEN)); indx += IPMI_SESSION_MAX_AUTH_CODE_LEN; @@ -970,21 +970,21 @@ unassemble_ipmi_lan_pkt (uint8_t *pkt, } } - obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, "ipmi_msg_len"); + obj_len = fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"ipmi_msg_len"); memcpy (obj_hdr_session + - fiid_obj_field_start_bytes (tmpl_hdr_session, "ipmi_msg_len"), + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"ipmi_msg_len"), pkt + indx, obj_len); indx += obj_len; } else { - indx += fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_type"); - indx += fiid_obj_field_len_bytes (tmpl_hdr_session, "session_seq_num"); - indx += fiid_obj_field_len_bytes (tmpl_hdr_session, "session_id"); + indx += fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_type"); + indx += fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"session_seq_num"); + indx += fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"session_id"); if (auth_type != IPMI_SESSION_AUTH_TYPE_NONE) indx += IPMI_SESSION_MAX_AUTH_CODE_LEN; - indx += fiid_obj_field_len_bytes (tmpl_hdr_session, "ipmi_msg_len"); + indx += fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"ipmi_msg_len"); } if (pkt_len <= indx) @@ -1072,27 +1072,27 @@ unassemble_ipmi_lan_pkt2 (ipmi_device_t fiid_obj_get_data (pkt, tmpl_lan_packet, - "RMCP_HDR", + (uint8_t *)"RMCP_HDR", dev->io.outofband.rs.obj_hdr_rmcp, rmcp_length); fiid_obj_get_data (pkt, tmpl_lan_packet, - "SESSION_HDR", + (uint8_t *)"SESSION_HDR", dev->io.outofband.rs.obj_hdr_session, session_length); fiid_obj_get_data (pkt, tmpl_lan_packet, - "MSG_HDR", + (uint8_t *)"MSG_HDR", dev->io.outofband.rs.obj_msg_hdr, hdr_length); fiid_obj_get_data (pkt, tmpl_lan_packet, - "COMMAND_DATA", + (uint8_t *)"COMMAND_DATA", obj_cmd, cmd_length); fiid_obj_get_data (pkt, tmpl_lan_packet, - "TRLR_HDR", + (uint8_t *)"TRLR_HDR", dev->io.outofband.rs.obj_msg_trlr, trlr_length); @@ -1113,7 +1113,7 @@ ipmi_lan_validate_checksum (ipmi_device_ ERR (get_rs_checksum1 (dev, &checksum) == 0); FIID_OBJ_GET (dev->io.outofband.rs.obj_msg_hdr, *(dev->io.outofband.rs.tmpl_msg_hdr_ptr), - "chksum1", + (uint8_t *)"chksum1", &val); ERR (val == checksum); @@ -1121,7 +1121,7 @@ ipmi_lan_validate_checksum (ipmi_device_ ERR (get_rs_checksum2 (dev, obj_cmd, tmpl_cmd, &checksum) == 0); FIID_OBJ_GET (dev->io.outofband.rs.obj_msg_trlr, *(dev->io.outofband.rs.tmpl_msg_trlr_ptr), - "chksum2", + (uint8_t *)"chksum2", &val); ERR (val == checksum); @@ -1636,9 +1636,9 @@ ipmi_lan_cmd_raw2 (ipmi_device_t *dev, {0, ""} }; - FIID_OBJ_GET ((fiid_obj_t) buf_rq, tmpl_hdr_cmd, "lun", &val); + FIID_OBJ_GET ((fiid_obj_t) buf_rq, tmpl_hdr_cmd, (uint8_t *)"lun", &val); dev->lun = val; - FIID_OBJ_GET ((fiid_obj_t) buf_rq, tmpl_hdr_cmd, "net_fn", &val); + FIID_OBJ_GET ((fiid_obj_t) buf_rq, tmpl_hdr_cmd, (uint8_t *)"net_fn", &val); dev->net_fn = val; } @@ -1651,7 +1651,7 @@ ipmi_lan_cmd_raw2 (ipmi_device_t *dev, obj_cmd_rq = (fiid_obj_t) (buf_rq + 1); obj_cmd_rq_len = buf_rq_len - 1; - tmpl_var_cmd_rq = fiid_template_make ((obj_cmd_rq_len * 8), "COMMAND_RQ_DATA"); + tmpl_var_cmd_rq = fiid_template_make ((obj_cmd_rq_len * 8), (uint8_t *)"COMMAND_RQ_DATA"); retval = ipmi_lan_cmd_raw_send (dev, obj_cmd_rq, tmpl_var_cmd_rq); @@ -1733,13 +1733,13 @@ ipmi_lan_cmd_raw2 (ipmi_device_t *dev, FIID_OBJ_GET (dev->io.outofband.rs.obj_msg_hdr, *(dev->io.outofband.rs.tmpl_msg_hdr_ptr), - "rq_lun", &val); - FIID_OBJ_SET ((fiid_obj_t) buf_rs, tmpl_hdr_cmd, "lun", val); + (uint8_t *)"rq_lun", &val); + FIID_OBJ_SET ((fiid_obj_t) buf_rs, tmpl_hdr_cmd, (uint8_t *)"lun", val); FIID_OBJ_GET (dev->io.outofband.rs.obj_msg_hdr, *(dev->io.outofband.rs.tmpl_msg_hdr_ptr), - "net_fn", &val); - FIID_OBJ_SET ((fiid_obj_t) buf_rs, tmpl_hdr_cmd, "net_fn", val); + (uint8_t *)"net_fn", &val); + FIID_OBJ_SET ((fiid_obj_t) buf_rs, tmpl_hdr_cmd, (uint8_t *)"net_fn", val); *buf_rs_len = obj_cmd_rs_len + 1; } @@ -1761,13 +1761,13 @@ ipmi_lan_check_net_fn (fiid_template_t t return (-1); } - if (!fiid_obj_field_lookup (tmpl_msg_hdr, "net_fn")) + if (!fiid_obj_field_lookup (tmpl_msg_hdr, (uint8_t *)"net_fn")) { errno = EINVAL; return (-1); } - FIID_OBJ_GET(obj_msg_hdr, tmpl_msg_hdr, "net_fn", &net_fn_recv); + FIID_OBJ_GET(obj_msg_hdr, tmpl_msg_hdr, (uint8_t *)"net_fn", &net_fn_recv); return ((((int8_t)net_fn_recv) == net_fn) ? 1 : 0); } @@ -1785,13 +1785,13 @@ ipmi_lan_check_rq_seq (fiid_template_t t return (-1); } - if (!fiid_obj_field_lookup (tmpl_msg_hdr, "rq_seq")) + if (!fiid_obj_field_lookup (tmpl_msg_hdr, (uint8_t *)"rq_seq")) { errno = EINVAL; return (-1); } - FIID_OBJ_GET(obj_msg_hdr, tmpl_msg_hdr, "rq_seq", &rq_seq_recv); + FIID_OBJ_GET(obj_msg_hdr, tmpl_msg_hdr, (uint8_t *)"rq_seq", &rq_seq_recv); return ((((int8_t)rq_seq_recv) == rq_seq) ? 1 : 0); } @@ -1808,10 +1808,10 @@ ipmi_lan_check_chksum (uint8_t *pkt, uin return (-1); } - if (pkt_len < (fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_end_bytes (tmpl_hdr_session, "auth_type"))) + if (pkt_len < (fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_end_bytes (tmpl_hdr_session, (uint8_t *)"auth_type"))) return (0); - auth_type_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session, "auth_type"); + auth_type_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"auth_type"); auth_type = pkt[auth_type_offset]; if (ipmi_chksum_test (pkt + IPMI_LAN_PKT_CHKSUM1_BLOCK_INDX (auth_type), Index: libfreeipmi/src/ipmi-lan-interface.h =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-lan-interface.h,v retrieving revision 1.8 diff -p -u -r1.8 ipmi-lan-interface.h --- libfreeipmi/src/ipmi-lan-interface.h 16 Dec 2005 08:48:40 -0000 1.8 +++ libfreeipmi/src/ipmi-lan-interface.h 19 Jan 2006 13:35:48 -0000 @@ -57,56 +57,56 @@ extern "C" { #define IPMI_LAN_PKT_CHKSUM1_BLOCK_INDX(auth_type) \ (fiid_obj_len_bytes (tmpl_hdr_rmcp) + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "auth_type") + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "session_seq_num") + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "session_id") + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"auth_type") + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"session_seq_num") + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"session_id") + \ ((auth_type == IPMI_SESSION_AUTH_TYPE_MD2 \ || auth_type == IPMI_SESSION_AUTH_TYPE_MD5 \ || auth_type == IPMI_SESSION_AUTH_TYPE_STRAIGHT_PASSWD_KEY \ || auth_type == IPMI_SESSION_AUTH_TYPE_OEM_PROP) \ - ? fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "auth_code") : 0) + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "ipmi_msg_len")) + ? fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"auth_code") : 0) + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"ipmi_msg_len")) #define IPMI_LAN_PKT_RQ_CHKSUM1_BLOCK_LEN \ - fiid_obj_field_start_bytes (tmpl_lan_msg_hdr_rq, "chksum1") + fiid_obj_field_start_bytes (tmpl_lan_msg_hdr_rq, (uint8_t *)"chksum1") #define IPMI_LAN_PKT_RQ_CHKSUM2_BLOCK_INDX(auth_type) \ (fiid_obj_len_bytes (tmpl_hdr_rmcp) + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "auth_type") + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "session_seq_num") + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "session_id") + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"auth_type") + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"session_seq_num") + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"session_id") + \ ((auth_type == IPMI_SESSION_AUTH_TYPE_MD2 \ || auth_type == IPMI_SESSION_AUTH_TYPE_MD5 \ || auth_type == IPMI_SESSION_AUTH_TYPE_STRAIGHT_PASSWD_KEY \ || auth_type == IPMI_SESSION_AUTH_TYPE_OEM_PROP) \ - ? fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "auth_code") : 0) + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "ipmi_msg_len") + \ - fiid_obj_field_end_bytes (tmpl_lan_msg_hdr_rq, "chksum1")) + ? fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"auth_code") : 0) + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"ipmi_msg_len") + \ + fiid_obj_field_end_bytes (tmpl_lan_msg_hdr_rq, (uint8_t *)"chksum1")) #define IPMI_LAN_PKT_RQ_CHKSUM2_BLOCK_LEN(tmpl_cmd) \ (fiid_obj_len_bytes (tmpl_lan_msg_hdr_rq) - \ - fiid_obj_field_end_bytes (tmpl_lan_msg_hdr_rq, "chksum1") + \ + fiid_obj_field_end_bytes (tmpl_lan_msg_hdr_rq, (uint8_t *)"chksum1") + \ fiid_obj_len_bytes (tmpl_cmd)) #define IPMI_LAN_PKT_RS_CHKSUM1_BLOCK_LEN \ - fiid_obj_field_start_bytes (tmpl_lan_msg_hdr_rs, "chksum1") + fiid_obj_field_start_bytes (tmpl_lan_msg_hdr_rs, (uint8_t *)"chksum1") #define IPMI_LAN_PKT_RS_CHKSUM2_BLOCK_INDX(auth_type) \ (fiid_obj_len_bytes (tmpl_hdr_rmcp) + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "auth_type") + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "session_seq_num") + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "session_id") + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"auth_type") + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"session_seq_num") + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"session_id") + \ ((auth_type == IPMI_SESSION_AUTH_TYPE_MD2 \ || auth_type == IPMI_SESSION_AUTH_TYPE_MD5 \ || auth_type == IPMI_SESSION_AUTH_TYPE_STRAIGHT_PASSWD_KEY \ || auth_type == IPMI_SESSION_AUTH_TYPE_OEM_PROP) \ - ? fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "auth_code") : 0) + \ - fiid_obj_field_len_bytes (tmpl_hdr_session_auth, "ipmi_msg_len") + \ - fiid_obj_field_end_bytes (tmpl_lan_msg_hdr_rs, "chksum1")) + ? fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"auth_code") : 0) + \ + fiid_obj_field_len_bytes (tmpl_hdr_session_auth, (uint8_t *)"ipmi_msg_len") + \ + fiid_obj_field_end_bytes (tmpl_lan_msg_hdr_rs, (uint8_t *)"chksum1")) #define IPMI_LAN_PKT_RS_CHKSUM2_BLOCK_LEN(tmpl_cmd) \ (fiid_obj_len_bytes (tmpl_lan_msg_hdr_rs) - \ - fiid_obj_field_end_bytes (tmpl_lan_msg_hdr_rs, "chksum1") + \ + fiid_obj_field_end_bytes (tmpl_lan_msg_hdr_rs, (uint8_t *)"chksum1") + \ fiid_obj_len_bytes (tmpl_cmd)) extern fiid_template_t tmpl_lan_msg_hdr_rq; Index: libfreeipmi/src/ipmi-md2.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-md2.c,v retrieving revision 1.5 diff -p -u -r1.5 ipmi-md2.c --- libfreeipmi/src/ipmi-md2.c 16 Dec 2005 08:48:40 -0000 1.5 +++ libfreeipmi/src/ipmi-md2.c 19 Jan 2006 13:35:49 -0000 @@ -206,7 +206,7 @@ _ipmi_md2_append_padding_and_checksum(ip padlen = IPMI_MD2_PADDING_LEN - Mlen; padindex = padlen - 1; - ipmi_md2_update_data(ctx, padding[padindex], padlen); + ipmi_md2_update_data(ctx, (uint8_t *)padding[padindex], (int)padlen); ipmi_md2_update_data(ctx, C, IPMI_MD2_CHKSUM_LEN); } Index: libfreeipmi/src/ipmi-md5.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-md5.c,v retrieving revision 1.5 diff -p -u -r1.5 ipmi-md5.c --- libfreeipmi/src/ipmi-md5.c 16 Dec 2005 08:48:40 -0000 1.5 +++ libfreeipmi/src/ipmi-md5.c 19 Jan 2006 13:35:49 -0000 @@ -331,7 +331,7 @@ _ipmi_md5_append_padding_and_length(ipmi length[7] = (ctx->bit_count[0] & 0xff000000) >> 24; ipmi_md5_update_data(ctx, padding, padlen); - ipmi_md5_update_data(ctx, length, 8); + ipmi_md5_update_data(ctx, (uint8_t *)length, 8); } int Index: libfreeipmi/src/ipmi-msg-support-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-msg-support-cmds.c,v retrieving revision 1.29 diff -p -u -r1.29 ipmi-msg-support-cmds.c --- libfreeipmi/src/ipmi-msg-support-cmds.c 7 Jan 2006 03:24:32 -0000 1.29 +++ libfreeipmi/src/ipmi-msg-support-cmds.c 19 Jan 2006 13:35:50 -0000 @@ -360,13 +360,13 @@ fill_cmd_get_channel_auth_caps (uint8_t return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_channel_auth_caps_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_channel_auth_caps_rq, (uint8_t *)"cmd", IPMI_CMD_GET_CHANNEL_AUTH_CAPS); FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_channel_auth_caps_rq, - "channel_num", channel_num); + (uint8_t *)"channel_num", channel_num); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_channel_auth_caps_rq, "max_priv_level", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_channel_auth_caps_rq, (uint8_t *)"max_priv_level", max_priv_level); return (0); } @@ -420,9 +420,9 @@ fill_cmd_get_session_challenge (uint8_t return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_session_challenge_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_session_challenge_rq, (uint8_t *)"cmd", IPMI_CMD_GET_SESSION_CHALLENGE); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_session_challenge_rq, "auth_type", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_session_challenge_rq, (uint8_t *)"auth_type", auth_type); /* achu: The BMC may ignore any '\0' characters that indicate the @@ -431,13 +431,13 @@ fill_cmd_get_session_challenge (uint8_t */ ERR_EXIT (fiid_obj_memset_field(obj_cmd, '\0', tmpl_cmd_get_session_challenge_rq, - "username") == 0); + (uint8_t *)"username") == 0); if (username) ERR_EXIT (fiid_obj_set_data (obj_cmd, tmpl_cmd_get_session_challenge_rq, - "username", - username, + (uint8_t *)"username", + (uint8_t *)username, username_len) == 0); return (0); @@ -491,20 +491,20 @@ fill_cmd_activate_session (uint8_t auth_ return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_activate_session_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_activate_session_rq, (uint8_t *)"cmd", IPMI_CMD_ACTIVATE_SESSION); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_activate_session_rq, "auth_type", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_activate_session_rq, (uint8_t *)"auth_type", auth_type); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_activate_session_rq, "max_priv_level", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_activate_session_rq, (uint8_t *)"max_priv_level", max_priv_level); ERR_EXIT (fiid_obj_memset_field (obj_cmd, '\0', tmpl_cmd_activate_session_rq, - "challenge_str") == 0); + (uint8_t *)"challenge_str") == 0); if (challenge_str) fiid_obj_set_data (obj_cmd, tmpl_cmd_activate_session_rq, - "challenge_str", challenge_str, + (uint8_t *)"challenge_str", challenge_str, challenge_str_len); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_activate_session_rq, "initial_outbound_seq_num", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_activate_session_rq, (uint8_t *)"initial_outbound_seq_num", initial_outbound_seq_num); return (0); } @@ -558,9 +558,9 @@ fill_cmd_set_session_priv_level (uint8_t return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_session_priv_level_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_session_priv_level_rq, (uint8_t *)"cmd", IPMI_CMD_SET_SESSION_PRIV_LEVEL); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_session_priv_level_rq, "priv_level", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_session_priv_level_rq, (uint8_t *)"priv_level", priv_level); return (0); } @@ -647,9 +647,9 @@ ipmi_lan_open_session (int sockfd, } FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_get_session_challenge_rs, - "tmp_session_id", &temp_session_id); + (uint8_t *)"tmp_session_id", &temp_session_id); *session_id = temp_session_id; - fiid_obj_get_data (obj_cmd_rs, tmpl_cmd_get_session_challenge_rs, "challenge_str", challenge_str, IPMI_SESSION_CHALLENGE_STR_LEN); + fiid_obj_get_data (obj_cmd_rs, tmpl_cmd_get_session_challenge_rs, (uint8_t *)"challenge_str", challenge_str, IPMI_SESSION_CHALLENGE_STR_LEN); ipmi_xfree (obj_cmd_rs); IPMI_LAN_RQ_SEQ_INC (*rq_seq); @@ -666,10 +666,10 @@ ipmi_lan_open_session (int sockfd, } FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_activate_session_rs, - "session_id", &temp_session_id); + (uint8_t *)"session_id", &temp_session_id); *session_id = temp_session_id; FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_activate_session_rs, - "initial_inbound_seq_num", &temp_session_seq_num); + (uint8_t *)"initial_inbound_seq_num", &temp_session_seq_num); *session_seq_num = temp_session_seq_num; ipmi_xfree (obj_cmd_rs); IPMI_LAN_RQ_SEQ_INC (*rq_seq); @@ -706,9 +706,9 @@ fill_cmd_close_session (uint32_t close_s return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_close_session_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_close_session_rq, (uint8_t *)"cmd", IPMI_CMD_CLOSE_SESSION); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_close_session_rq, "session_id", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_close_session_rq, (uint8_t *)"session_id", close_session_id); return (0); } @@ -767,47 +767,47 @@ fill_kcs_set_channel_access (fiid_obj_t FIID_OBJ_SET (obj_data_rq, tmpl_set_channel_access_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_CHANNEL_ACCESS); FIID_OBJ_SET (obj_data_rq, tmpl_set_channel_access_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_channel_access_rq, - "ipmi_messaging_access_mode", + (uint8_t *)"ipmi_messaging_access_mode", ipmi_messaging_access_mode); FIID_OBJ_SET (obj_data_rq, tmpl_set_channel_access_rq, - "user_level_authentication", + (uint8_t *)"user_level_authentication", user_level_authentication); FIID_OBJ_SET (obj_data_rq, tmpl_set_channel_access_rq, - "per_message_authentication", + (uint8_t *)"per_message_authentication", per_message_authentication); FIID_OBJ_SET (obj_data_rq, tmpl_set_channel_access_rq, - "pef_alerting", + (uint8_t *)"pef_alerting", pef_alerting); FIID_OBJ_SET (obj_data_rq, tmpl_set_channel_access_rq, - "channel_access_set_flag", + (uint8_t *)"channel_access_set_flag", channel_access_set_flag); FIID_OBJ_SET (obj_data_rq, tmpl_set_channel_access_rq, - "channel_privilege_level_limit", + (uint8_t *)"channel_privilege_level_limit", channel_privilege_level_limit); FIID_OBJ_SET (obj_data_rq, tmpl_set_channel_access_rq, - "channel_privilege_level_limit_set_flag", + (uint8_t *)"channel_privilege_level_limit_set_flag", channel_privilege_level_limit_set_flag); return 0; @@ -831,12 +831,12 @@ fill_kcs_set_user_name (fiid_obj_t obj_d FIID_OBJ_SET (obj_data_rq, tmpl_set_user_name_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_USER_NAME); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_name_rq, - "user_id", + (uint8_t *)"user_id", user_id); /* achu: The BMC may ignore any '\0' characters that indicate the @@ -845,13 +845,13 @@ fill_kcs_set_user_name (fiid_obj_t obj_d */ ERR_EXIT (fiid_obj_memset_field(obj_data_rq, '\0', tmpl_set_user_name_rq, - "user_name") == 0); + (uint8_t *)"user_name") == 0); if (user_name) ERR_EXIT (fiid_obj_set_data (obj_data_rq, tmpl_set_user_name_rq, - "user_name", - user_name, + (uint8_t *)"user_name", + (uint8_t *)user_name, user_name_len) == 0); return 0; @@ -862,12 +862,12 @@ fill_kcs_get_user_name (fiid_obj_t obj_d { FIID_OBJ_SET (obj_data_rq, tmpl_get_user_name_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_USER_NAME_CMD); FIID_OBJ_SET (obj_data_rq, tmpl_get_user_name_rq, - "user_id", + (uint8_t *)"user_id", user_id); return 0; @@ -893,17 +893,17 @@ fill_kcs_set_user_password (fiid_obj_t o FIID_OBJ_SET (obj_data_rq, tmpl_set_user_password_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_USER_PASSWORD_CMD); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_password_rq, - "user_id", + (uint8_t *)"user_id", user_id); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_password_rq, - "operation", + (uint8_t *)"operation", operation); /* achu: The BMC may ignore any '\0' characters that indicate the @@ -912,13 +912,13 @@ fill_kcs_set_user_password (fiid_obj_t o */ ERR_EXIT (fiid_obj_memset_field(obj_data_rq, '\0', tmpl_set_user_password_rq, - "password") == 0); + (uint8_t *)"password") == 0); if (user_password) ERR_EXIT (fiid_obj_set_data (obj_data_rq, tmpl_set_user_password_rq, - "password", - user_password, + (uint8_t *)"password", + (uint8_t *)user_password, user_password_len) == 0); return 0; @@ -943,47 +943,47 @@ fill_kcs_set_user_access (fiid_obj_t obj FIID_OBJ_SET (obj_data_rq, tmpl_set_user_access_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_USER_ACCESS_CMD); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_access_rq, - "modify_flag", + (uint8_t *)"modify_flag", 1); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_access_rq, - "user_flags.restrict_to_callback", + (uint8_t *)"user_flags.restrict_to_callback", restrict_to_callback); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_access_rq, - "user_flags.enable_link_auth", + (uint8_t *)"user_flags.enable_link_auth", enable_link_auth); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_access_rq, - "user_flags.enable_ipmi_msgs", + (uint8_t *)"user_flags.enable_ipmi_msgs", enable_ipmi_msgs); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_access_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_access_rq, - "user_id", + (uint8_t *)"user_id", user_id); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_access_rq, - "user_privilege_level_limit", + (uint8_t *)"user_privilege_level_limit", user_privilege_level_limit); FIID_OBJ_SET (obj_data_rq, tmpl_set_user_access_rq, - "user_session_number_limit", + (uint8_t *)"user_session_number_limit", user_session_number_limit); return 0; @@ -1003,17 +1003,17 @@ fill_kcs_get_user_access (fiid_obj_t obj FIID_OBJ_SET (obj_data_rq, tmpl_get_user_access_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_USER_ACCESS_CMD); FIID_OBJ_SET (obj_data_rq, tmpl_get_user_access_rq, - "user_id", + (uint8_t *)"user_id", user_id); FIID_OBJ_SET (obj_data_rq, tmpl_get_user_access_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); return 0; @@ -1033,17 +1033,17 @@ fill_kcs_get_channel_access (fiid_obj_t FIID_OBJ_SET (obj_data_rq, tmpl_get_channel_access_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_CHANNEL_ACCESS); FIID_OBJ_SET (obj_data_rq, tmpl_get_channel_access_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_get_channel_access_rq, - "channel_access_set_flag", + (uint8_t *)"channel_access_set_flag", channel_access_set_flag); return 0; @@ -1061,12 +1061,12 @@ fill_kcs_get_channel_info (fiid_obj_t ob FIID_OBJ_SET (obj_data_rq, tmpl_get_channel_info_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_CHANNEL_INFO_CMD); FIID_OBJ_SET (obj_data_rq, tmpl_get_channel_info_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); return 0; @@ -1083,13 +1083,13 @@ ipmi_check_cmd(fiid_template_t tmpl_cmd, return (-1); } - if (!fiid_obj_field_lookup (tmpl_cmd, "cmd")) + if (!fiid_obj_field_lookup (tmpl_cmd, (uint8_t *)"cmd")) { errno = EINVAL; return (-1); } - FIID_OBJ_GET(obj_cmd, tmpl_cmd, "cmd", &cmd_recv); + FIID_OBJ_GET(obj_cmd, tmpl_cmd, (uint8_t *)"cmd", &cmd_recv); return ((((int8_t)cmd_recv) == cmd) ? 1 : 0); } @@ -1105,13 +1105,13 @@ ipmi_check_comp_code(fiid_template_t tmp return (-1); } - if (!fiid_obj_field_lookup (tmpl_cmd, "comp_code")) + if (!fiid_obj_field_lookup (tmpl_cmd, (uint8_t *)"comp_code")) { errno = EINVAL; return (-1); } - FIID_OBJ_GET(obj_cmd, tmpl_cmd, "comp_code", &comp_code_recv); + FIID_OBJ_GET(obj_cmd, tmpl_cmd, (uint8_t *)"comp_code", &comp_code_recv); return ((((int8_t)comp_code_recv) == comp_code) ? 1 : 0); } @@ -1128,8 +1128,8 @@ ipmi_get_channel_number2 (ipmi_device_t ERR (ipmi_cmd_get_dev_id (dev, obj_data_rs) == 0); - FIID_OBJ_GET (obj_data_rs, tmpl_cmd_get_dev_id_rs, "manf_id.id", &manf_id); - FIID_OBJ_GET (obj_data_rs, tmpl_cmd_get_dev_id_rs, "prod_id", &prod_id); + FIID_OBJ_GET (obj_data_rs, tmpl_cmd_get_dev_id_rs, (uint8_t *)"manf_id.id", &manf_id); + FIID_OBJ_GET (obj_data_rs, tmpl_cmd_get_dev_id_rs, (uint8_t *)"prod_id", &prod_id); switch (manf_id) { @@ -1158,13 +1158,13 @@ ipmi_get_channel_number2 (ipmi_device_t FIID_OBJ_GET (data_rs, tmpl_get_channel_info_rs, - "channel_medium_type", + (uint8_t *)"channel_medium_type", &val); if ((uint8_t) val == channel_medium_type) { FIID_OBJ_GET (data_rs, tmpl_get_channel_info_rs, - "actual_channel_number", + (uint8_t *)"actual_channel_number", &val); return (int8_t) val; } @@ -1235,7 +1235,7 @@ ipmi_cmd_get_session_challenge2 (ipmi_de FIID_OBJ_ALLOCA (obj_cmd_rq, tmpl_cmd_get_session_challenge_rq); ERR (fill_cmd_get_session_challenge (dev->io.outofband.auth_type, - dev->io.outofband.username, + (char *)dev->io.outofband.username, IPMI_SESSION_MAX_USERNAME_LEN, obj_cmd_rq) == 0); @@ -1335,23 +1335,23 @@ ipmi_lan_open_session2 (ipmi_device_t *d { case IPMI_SESSION_AUTH_TYPE_NONE: FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.none", &supported_auth_type); + (uint8_t *)"auth_type.none", &supported_auth_type); break; case IPMI_SESSION_AUTH_TYPE_MD2: FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.md2", &supported_auth_type); + (uint8_t *)"auth_type.md2", &supported_auth_type); break; case IPMI_SESSION_AUTH_TYPE_MD5: FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.md5", &supported_auth_type); + (uint8_t *)"auth_type.md5", &supported_auth_type); break; case IPMI_SESSION_AUTH_TYPE_STRAIGHT_PASSWD_KEY: FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.straight_passwd_key", &supported_auth_type); + (uint8_t *)"auth_type.straight_passwd_key", &supported_auth_type); break; case IPMI_SESSION_AUTH_TYPE_OEM_PROP: FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_get_channel_auth_caps_rs, - "auth_type.oem_prop", &supported_auth_type); + (uint8_t *)"auth_type.oem_prop", &supported_auth_type); break; default: errno = EINVAL; @@ -1366,11 +1366,11 @@ ipmi_lan_open_session2 (ipmi_device_t *d FIID_OBJ_ALLOCA (obj_cmd_rs, tmpl_cmd_get_session_challenge_rs); ERR (ipmi_cmd_get_session_challenge2 (dev, obj_cmd_rs) == 0); FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_get_session_challenge_rs, - "tmp_session_id", &temp_session_id); + (uint8_t *)"tmp_session_id", &temp_session_id); dev->io.outofband.session_id = temp_session_id; ERR (fiid_obj_get_data (obj_cmd_rs, tmpl_cmd_get_session_challenge_rs, - "challenge_str", + (uint8_t *)"challenge_str", challenge_str, IPMI_SESSION_CHALLENGE_STR_LEN) == 0); memcpy (dev->io.outofband.challenge_string, @@ -1380,10 +1380,10 @@ ipmi_lan_open_session2 (ipmi_device_t *d FIID_OBJ_ALLOCA (obj_cmd_rs, tmpl_cmd_activate_session_rs); ERR (ipmi_cmd_activate_session2 (dev, obj_cmd_rs) == 0); FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_activate_session_rs, - "session_id", &temp_session_id); + (uint8_t *)"session_id", &temp_session_id); dev->io.outofband.session_id = temp_session_id; FIID_OBJ_GET (obj_cmd_rs, tmpl_cmd_activate_session_rs, - "initial_inbound_seq_num", &temp_session_seq_num); + (uint8_t *)"initial_inbound_seq_num", &temp_session_seq_num); dev->io.outofband.session_seq_num = temp_session_seq_num; FIID_OBJ_ALLOCA (obj_cmd_rs, tmpl_cmd_set_session_priv_level_rs); Index: libfreeipmi/src/ipmi-pef-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-pef-cmds.c,v retrieving revision 1.17 diff -p -u -r1.17 ipmi-pef-cmds.c --- libfreeipmi/src/ipmi-pef-cmds.c 7 Jan 2006 03:24:32 -0000 1.17 +++ libfreeipmi/src/ipmi-pef-cmds.c 19 Jan 2006 13:35:50 -0000 @@ -581,23 +581,23 @@ fill_kcs_alert_immediate (fiid_obj_t obj { FIID_OBJ_SET (obj_data_rq, tmpl_alert_immediate_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_ALERT_IMMEDIATE); FIID_OBJ_SET (obj_data_rq, tmpl_alert_immediate_rq, - "alert_immediate_channel_number", + (uint8_t *)"alert_immediate_channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_alert_immediate_rq, - "alert_immediate_destination_selector", + (uint8_t *)"alert_immediate_destination_selector", destination_selector); FIID_OBJ_SET (obj_data_rq, tmpl_alert_immediate_rq, - "alert_immediate_string_selector", + (uint8_t *)"alert_immediate_string_selector", string_selector); FIID_OBJ_SET (obj_data_rq, tmpl_alert_immediate_rq, - "alert_immediate_string_enable", + (uint8_t *)"alert_immediate_string_enable", string_enable); return 0; } @@ -610,27 +610,27 @@ fill_kcs_get_pef_conf_param (fiid_obj_t { FIID_OBJ_SET (obj_data_rq, tmpl_get_pef_conf_param_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_PEF_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_get_pef_conf_param_rq, - "parameter_type", + (uint8_t *)"parameter_type", parameter_type); FIID_OBJ_SET (obj_data_rq, tmpl_get_pef_conf_param_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", parameter_selector); FIID_OBJ_SET (obj_data_rq, tmpl_get_pef_conf_param_rq, - "set_selector", + (uint8_t *)"set_selector", set_selector); FIID_OBJ_SET (obj_data_rq, tmpl_get_pef_conf_param_rq, - "block_selector", + (uint8_t *)"block_selector", block_selector); return 0; @@ -643,23 +643,23 @@ fill_kcs_set_pef_control (fiid_obj_t obj { FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_pef_control_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_PEF_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_pef_control_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_PEF_PARAM_PEF_CONTROL); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_pef_control_rq, - "enable_pef", + (uint8_t *)"enable_pef", enable_pef); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_pef_control_rq, - "enable_startup_delay", + (uint8_t *)"enable_startup_delay", enable_startup_delay); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_pef_control_rq, - "enable_alert_startup_delay", + (uint8_t *)"enable_alert_startup_delay", enable_alert_startup_delay); return 0; } @@ -672,35 +672,35 @@ fill_kcs_set_global_action_control (fiid { FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_global_action_control_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_PEF_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_global_action_control_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_PEF_PARAM_ACTION_GLOBAL_CONTROL); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_global_action_control_rq, - "enable_alert_action", + (uint8_t *)"enable_alert_action", enable_alert); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_global_action_control_rq, - "enable_powerdown_action", + (uint8_t *)"enable_powerdown_action", enable_powerdown); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_global_action_control_rq, - "enable_reset_action", + (uint8_t *)"enable_reset_action", enable_reset); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_global_action_control_rq, - "enable_powercycle_action", + (uint8_t *)"enable_powercycle_action", enable_powercycle); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_global_action_control_rq, - "enable_oem_action", + (uint8_t *)"enable_oem_action", enable_oem); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_global_action_control_rq, - "enable_diag_interrupt", + (uint8_t *)"enable_diag_interrupt", enable_diag_interrupt); return 0; } @@ -710,15 +710,15 @@ fill_kcs_set_startup_delay (fiid_obj_t o { FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_startup_delay_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_PEF_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_startup_delay_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_PEF_PARAM_STARTUP_DELAY); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_startup_delay_rq, - "startup_delay", + (uint8_t *)"startup_delay", startup_delay); return 0; } @@ -728,15 +728,15 @@ fill_kcs_set_alert_startup_delay (fiid_o { FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_alert_startup_delay_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_PEF_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_alert_startup_delay_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_PEF_PARAM_ALERT_STARTUP_DELAY); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_alert_startup_delay_rq, - "alert_startup_delay", + (uint8_t *)"alert_startup_delay", alert_startup_delay); return 0; } @@ -746,15 +746,15 @@ fill_kcs_set_num_event_filters (fiid_obj { FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_num_event_filters_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_PEF_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_num_event_filters_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_PEF_PARAM_NUM_EVENT_FILTERS); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_num_event_filters_rq, - "num_event_filters", + (uint8_t *)"num_event_filters", num_event_filters); return 0; } @@ -765,123 +765,123 @@ fill_kcs_set_filter_table_entry (fiid_ob { FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_PEF_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_PEF_PARAM_EVENT_FILTER_TABLE); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_number", + (uint8_t *)"filter_number", eft_entry->filter_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_type", + (uint8_t *)"filter_type", eft_entry->filter_type); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_enable", + (uint8_t *)"filter_enable", eft_entry->filter_enable); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_action_alert", + (uint8_t *)"filter_action_alert", eft_entry->event_filter_action_alert); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_action_poweroff", + (uint8_t *)"filter_action_poweroff", eft_entry->event_filter_action_poweroff); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_action_reset", + (uint8_t *)"filter_action_reset", eft_entry->event_filter_action_reset); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_action_powercycle", + (uint8_t *)"filter_action_powercycle", eft_entry->event_filter_action_powercycle); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_action_oem", + (uint8_t *)"filter_action_oem", eft_entry->event_filter_action_oem); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_action_diag_interrupt", + (uint8_t *)"filter_action_diag_interrupt", eft_entry->event_filter_action_diag_interrupt); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "filter_action_group_control_operation", + (uint8_t *)"filter_action_group_control_operation", eft_entry->event_filter_action_group_control_operation); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "policy_number", + (uint8_t *)"policy_number", eft_entry->policy_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "group_control_selector", + (uint8_t *)"group_control_selector", eft_entry->group_control_selector); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_severity", + (uint8_t *)"event_severity", eft_entry->event_severity); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "generator_id_byte1", + (uint8_t *)"generator_id_byte1", eft_entry->generator_id_byte1); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "generator_id_byte2", + (uint8_t *)"generator_id_byte2", eft_entry->generator_id_byte2); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "sensor_type", + (uint8_t *)"sensor_type", eft_entry->sensor_type); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "sensor_number", + (uint8_t *)"sensor_number", eft_entry->sensor_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_reading_type", + (uint8_t *)"event_reading_type", eft_entry->event_reading_type); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data1_offset_mask", + (uint8_t *)"event_data1_offset_mask", eft_entry->event_data1_offset_mask); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data1_AND_mask", + (uint8_t *)"event_data1_AND_mask", eft_entry->event_data1_AND_mask); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data1_compare1", + (uint8_t *)"event_data1_compare1", eft_entry->event_data1_compare1); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data1_compare2", + (uint8_t *)"event_data1_compare2", eft_entry->event_data1_compare2); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data2_AND_mask", + (uint8_t *)"event_data2_AND_mask", eft_entry->event_data2_AND_mask); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data2_compare1", + (uint8_t *)"event_data2_compare1", eft_entry->event_data2_compare1); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data2_compare2", + (uint8_t *)"event_data2_compare2", eft_entry->event_data2_compare2); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data3_AND_mask", + (uint8_t *)"event_data3_AND_mask", eft_entry->event_data3_AND_mask); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data3_compare1", + (uint8_t *)"event_data3_compare1", eft_entry->event_data3_compare1); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_table_rq, - "event_data3_compare2", + (uint8_t *)"event_data3_compare2", eft_entry->event_data3_compare2); return 0; } @@ -892,23 +892,23 @@ fill_kcs_set_filter_table_data1 (fiid_ob { FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_data1_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_PEF_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_data1_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_PEF_PARAM_EVENT_FILTER_TABLE_DATA_1); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_data1_rq, - "filter_number", + (uint8_t *)"filter_number", filter_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_data1_rq, - "filter_type", + (uint8_t *)"filter_type", filter_type); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_event_filter_data1_rq, - "filter_enable", + (uint8_t *)"filter_enable", enabled); return 0; } @@ -918,15 +918,15 @@ fill_kcs_set_num_alert_policies (fiid_ob { FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_num_alert_policies_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_PEF_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_num_alert_policies_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_PEF_PARAM_NUM_ALERT_POLICY_ENTRIES); FIID_OBJ_SET (obj_data_rq, tmpl_set_pef_conf_param_num_alert_policies_rq, - "num_alert_policies", + (uint8_t *)"num_alert_policies", num_alert_policies); return 0; } @@ -964,7 +964,7 @@ fill_kcs_get_pef_caps (fiid_obj_t obj_da { FIID_OBJ_SET (obj_data_rq, tmpl_get_pef_caps_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_PEF_CAPS); return 0; } @@ -974,11 +974,11 @@ fill_kcs_arm_pef_postpone_timer (fiid_ob { FIID_OBJ_SET (obj_data_rq, tmpl_arm_pef_postpone_timer_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_ARM_PEF_POSTPONE_TIMER); FIID_OBJ_SET (obj_data_rq, tmpl_arm_pef_postpone_timer_rq, - "arm_pef_postpone_timer_countdown", + (uint8_t *)"arm_pef_postpone_timer_countdown", countdown); return 0; } @@ -988,15 +988,15 @@ fill_kcs_set_last_processed_event (fiid_ { FIID_OBJ_SET (obj_data_rq, tmpl_set_last_processed_event_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_LAST_PROCESSED_EVENT_ID); FIID_OBJ_SET (obj_data_rq, tmpl_set_last_processed_event_rq, - "set_last_processed_event_which", + (uint8_t *)"set_last_processed_event_which", which); FIID_OBJ_SET (obj_data_rq, tmpl_set_last_processed_event_rq, - "set_last_processed_event_id", + (uint8_t *)"set_last_processed_event_id", id); return 0; } @@ -1006,7 +1006,7 @@ fill_kcs_get_last_proessed_event (fiid_o { FIID_OBJ_SET (obj_data_rq, tmpl_get_last_processed_event_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_LAST_PROCESSED_EVENT_ID); return 0; } @@ -1018,31 +1018,31 @@ fill_kcs_pet_ack (fiid_obj_t obj_data_rq { FIID_OBJ_SET (obj_data_rq, tmpl_pet_ack_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_PET_ACKNOWLEDGE); FIID_OBJ_SET (obj_data_rq, tmpl_pet_ack_rq, - "pet_ack_sequence_number", + (uint8_t *)"pet_ack_sequence_number", sequence_number); FIID_OBJ_SET (obj_data_rq, tmpl_pet_ack_rq, - "pet_ack_timestamp", + (uint8_t *)"pet_ack_timestamp", timestamp); FIID_OBJ_SET (obj_data_rq, tmpl_pet_ack_rq, - "pet_ack_source_type", + (uint8_t *)"pet_ack_source_type", source_type); FIID_OBJ_SET (obj_data_rq, tmpl_pet_ack_rq, - "pet_ack_sensor_device", + (uint8_t *)"pet_ack_sensor_device", sensor_device); FIID_OBJ_SET (obj_data_rq, tmpl_pet_ack_rq, - "pet_ack_sensor_number", + (uint8_t *)"pet_ack_sensor_number", sensor_number); FIID_OBJ_SET (obj_data_rq, tmpl_pet_ack_rq, - "pet_ack_event_data", + (uint8_t *)"pet_ack_event_data", event_data); return 0; } Index: libfreeipmi/src/ipmi-sdr-repo-cache.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sdr-repo-cache.c,v retrieving revision 1.9 diff -p -u -r1.9 ipmi-sdr-repo-cache.c --- libfreeipmi/src/ipmi-sdr-repo-cache.c 7 Jan 2006 03:24:32 -0000 1.9 +++ libfreeipmi/src/ipmi-sdr-repo-cache.c 19 Jan 2006 13:35:51 -0000 @@ -39,7 +39,7 @@ ipmi_sdr_repo_info_write (ipmi_device_t fiid_obj_get (data_rs, tmpl_get_sdr_repo_info_rs, - "comp_code", + (uint8_t *)"comp_code", &val); if (val != 0) return (-1); @@ -89,13 +89,13 @@ ipmi_sdr_records_write (ipmi_device_t *d fiid_obj_get (obj_cmd_rs, tmpl_get_sdr_rs, - "next_record_id", + (uint8_t *)"next_record_id", &val); record_id = (uint16_t) val; fiid_obj_get (obj_sdr_record, tmpl_sdr_sensor_record_header, - "record_length", + (uint8_t *)"record_length", &val); record_length = (uint8_t) val; @@ -176,7 +176,7 @@ ipmi_sdr_repo_cache_load (sdr_repo_cache fiid_obj_get (sdr_repo_cache->cache_start, tmpl_get_sdr_repo_info_rs, - "record_count", + (uint8_t *)"record_count", &val); sdr_repo_cache->total_records = (uint32_t) val; @@ -298,7 +298,7 @@ ipmi_is_sensor_reading_available (sdr_re fiid_obj_get (sdr_repo_cache->cache_curr, tmpl_sdr_sensor_record_header, - "record_type", + (uint8_t *)"record_type", &val); switch (val) @@ -306,7 +306,7 @@ ipmi_is_sensor_reading_available (sdr_re case IPMI_SDR_FORMAT_FULL_RECORD: fiid_obj_get (sdr_repo_cache->cache_curr, tmpl_sdr_full_sensor_record, - "slave_system_software_id", + (uint8_t *)"slave_system_software_id", &val); if (ipmi_get_system_software_type (val) == IPMI_SYS_SOFT_ID_RESERVED) return (0); @@ -315,7 +315,7 @@ ipmi_is_sensor_reading_available (sdr_re case IPMI_SDR_FORMAT_COMPACT_RECORD: fiid_obj_get (sdr_repo_cache->cache_curr, tmpl_sdr_compact_sensor_record, - "slave_system_software_id", + (uint8_t *)"slave_system_software_id", &val); if (ipmi_get_system_software_type (val) == IPMI_SYS_SOFT_ID_RESERVED) return (0); @@ -350,18 +350,18 @@ ipmi_sdr_repo_cache_sensor_classify (sdr fiid_obj_get(sdr_repo_cache->cache_curr, tmpl_sdr_sensor_record_header, - "record_type", + (uint8_t *)"record_type", &record_type); if (record_type == IPMI_SDR_FORMAT_FULL_RECORD) fiid_obj_get (sdr_repo_cache->cache_curr, tmpl_sdr_full_sensor_record, - "event_reading_type", + (uint8_t *)"event_reading_type", &val); else if (record_type == IPMI_SDR_FORMAT_COMPACT_RECORD) fiid_obj_get (sdr_repo_cache->cache_curr, tmpl_sdr_compact_sensor_record, - "event_reading_type", + (uint8_t *)"event_reading_type", &val); else return IPMI_SENSOR_CLASS_NOT_AVAILABLE; @@ -383,14 +383,14 @@ ipmi_sdr_repo_cache_get_sensor_group (sd fiid_obj_get (sdr_repo_cache->cache_curr, tmpl_sdr_sensor_record_header, - "record_type", + (uint8_t *)"record_type", &val); if (val == IPMI_SDR_FORMAT_FULL_RECORD) { fiid_obj_get (sdr_repo_cache->cache_curr, tmpl_sdr_full_sensor_record, - "sensor_type", + (uint8_t *)"sensor_type", &val); sensor_type = val; return ipmi_get_sensor_group (sensor_type); @@ -400,7 +400,7 @@ ipmi_sdr_repo_cache_get_sensor_group (sd { fiid_obj_get (sdr_repo_cache->cache_curr, tmpl_sdr_compact_sensor_record, - "sensor_type", + (uint8_t *)"sensor_type", &val); sensor_type = val; return ipmi_get_sensor_group (sensor_type); @@ -427,7 +427,7 @@ ipmi_sdr_repo_cache_get_sensor_name (sdr ERR (!(fiid_obj_get(sdr_repo_cache->cache_curr, tmpl_sdr_sensor_record_header, - "record_type", + (uint8_t *)"record_type", &val) < 0)); record_type = val; @@ -435,7 +435,7 @@ ipmi_sdr_repo_cache_get_sensor_name (sdr { ERR (fiid_obj_get(sdr_repo_cache->cache_curr, tmpl_sdr_full_sensor_record, - "record_length", + (uint8_t *)"record_length", &val) >= 0); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); @@ -462,7 +462,7 @@ ipmi_sdr_repo_cache_get_sensor_name (sdr { ERR (fiid_obj_get(sdr_repo_cache->cache_curr, tmpl_sdr_compact_sensor_record, - "record_length", + (uint8_t *)"record_length", &val) >= 0); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); Index: libfreeipmi/src/ipmi-sdr-repo-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sdr-repo-cmds.c,v retrieving revision 1.11 diff -p -u -r1.11 ipmi-sdr-repo-cmds.c --- libfreeipmi/src/ipmi-sdr-repo-cmds.c 7 Jan 2006 03:24:32 -0000 1.11 +++ libfreeipmi/src/ipmi-sdr-repo-cmds.c 19 Jan 2006 13:35:51 -0000 @@ -104,7 +104,7 @@ fill_kcs_get_repo_info (fiid_obj_t obj_d { FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_repo_info_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SDR_REPOSITORY_INFO); return 0; } @@ -114,7 +114,7 @@ fill_kcs_get_repo_alloc_info (fiid_obj_t { FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_repo_alloc_info_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SDR_REPOSITORY_ALLOC_INFO); return 0; } @@ -124,7 +124,7 @@ fill_kcs_reserve_repo (fiid_obj_t obj_da { FIID_OBJ_SET (obj_data_rq, tmpl_reserve_sdr_repo_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_RESERVE_SDR_REPOSITORY); return 0; } @@ -134,27 +134,27 @@ fill_kcs_get_sensor_record_header (fiid_ { FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SDR); FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "reservation_id", + (uint8_t *)"reservation_id", 0x0); FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "record_id", + (uint8_t *)"record_id", record_id); FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "record_offset", + (uint8_t *)"record_offset", 0x0); FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "bytes_read", + (uint8_t *)"bytes_read", fiid_obj_len_bytes (tmpl_sdr_sensor_record_header)); return 0; } @@ -168,27 +168,27 @@ fill_kcs_get_sdr_chunk (fiid_obj_t obj_d { FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SDR); FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "reservation_id", + (uint8_t *)"reservation_id", reservation_id); FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "record_id", + (uint8_t *)"record_id", record_id); FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "record_offset", + (uint8_t *)"record_offset", record_offset); FIID_OBJ_SET (obj_data_rq, tmpl_get_sdr_rq, - "bytes_read", + (uint8_t *)"bytes_read", bytes_read); return 0; } @@ -321,12 +321,12 @@ ipmi_cmd_get_sensor_record_header2 (ipmi } fiid_obj_get_data (local_obj_cmd_rs, tmpl_var_len_get_sdr_rs, - "sdr_rs", + (uint8_t *)"sdr_rs", obj_cmd_rs, fiid_obj_len_bytes(tmpl_get_sdr_rs)); fiid_obj_get_data (local_obj_cmd_rs, tmpl_var_len_get_sdr_rs, - "header_data", + (uint8_t *)"header_data", sensor_record_header, fiid_obj_len_bytes(tmpl_sdr_sensor_record_header)); @@ -398,12 +398,12 @@ ipmi_cmd_get_sdr_chunk2 (ipmi_device_t * fiid_obj_get_data (local_obj_cmd_rs, tmpl_var_len_get_sdr_rs, - "sdr_rs", + (uint8_t *)"sdr_rs", obj_cmd_rs, fiid_obj_len_bytes(tmpl_get_sdr_rs)); fiid_obj_get_data (local_obj_cmd_rs, tmpl_var_len_get_sdr_rs, - "chunk_data", + (uint8_t *)"chunk_data", sensor_record_chunk, sensor_record_chunk_len); @@ -445,7 +445,7 @@ ipmi_cmd_get_sdr2 (ipmi_device_t *dev, sensor_record_header) == 0); FIID_OBJ_GET (sensor_record_header, tmpl_sdr_sensor_record_header, - "record_length", + (uint8_t *)"record_length", &val); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); @@ -459,7 +459,7 @@ ipmi_cmd_get_sdr2 (ipmi_device_t *dev, ERR (ipmi_cmd_reserve_sdr_repo2 (dev, local_obj_cmd_rs) == 0); FIID_OBJ_GET (local_obj_cmd_rs, tmpl_reserve_sdr_repo_rs, - "reservation_id", + (uint8_t *)"reservation_id", &val); reservation_id = (uint16_t) val; } Index: libfreeipmi/src/ipmi-sel-api.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sel-api.c,v retrieving revision 1.4 diff -p -u -r1.4 ipmi-sel-api.c --- libfreeipmi/src/ipmi-sel-api.c 16 Dec 2005 08:48:40 -0000 1.4 +++ libfreeipmi/src/ipmi-sel-api.c 19 Jan 2006 13:35:51 -0000 @@ -42,13 +42,13 @@ ipmi_sel_get_first_entry (ipmi_device_t seld->first_record_id = IPMI_SEL_FIRST_ENTRY; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_entry_rs, - "next_record_id", + (uint8_t *)"next_record_id", &val); seld->next_record_id = val; fiid_obj_get_data (obj_cmd_rs, tmpl_get_sel_entry_rs, - "record_data", + (uint8_t *)"record_data", record_data, record_data_len); @@ -78,13 +78,13 @@ ipmi_sel_get_next_entry (ipmi_device_t * fiid_obj_get (obj_cmd_rs, tmpl_get_sel_entry_rs, - "next_record_id", + (uint8_t *)"next_record_id", &val); seld->next_record_id = val; fiid_obj_get_data (obj_cmd_rs, tmpl_get_sel_entry_rs, - "record_data", + (uint8_t *)"record_data", record_data, record_data_len); @@ -106,68 +106,68 @@ get_sel_info (ipmi_device_t *dev, sel_in fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "sel_version_major", + (uint8_t *)"sel_version_major", &val); pinfo->version_major = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "sel_version_minor", + (uint8_t *)"sel_version_minor", &val); pinfo->version_minor = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "log_entry_count", + (uint8_t *)"log_entry_count", &val); pinfo->entry_count = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "free_space", + (uint8_t *)"free_space", &val); pinfo->free_space = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "recent_addition_timestamp", + (uint8_t *)"recent_addition_timestamp", &val); pinfo->last_add_time = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "recent_erase_timestamp", + (uint8_t *)"recent_erase_timestamp", &val); pinfo->last_erase_time = val; pinfo->flags = 0; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "get_sel_alloc_info_cmd_support", + (uint8_t *)"get_sel_alloc_info_cmd_support", &val); if (val) pinfo->flags |= get_sel_alloc_info_cmd_support; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "reserve_sel_cmd_support", + (uint8_t *)"reserve_sel_cmd_support", &val); if (val) pinfo->flags |= reserve_sel_cmd_support; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "partial_add_sel_entry_cmd_support", + (uint8_t *)"partial_add_sel_entry_cmd_support", &val); if (val) pinfo->flags |= partial_add_sel_entry_cmd_support; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "delete_sel_cmd_support", + (uint8_t *)"delete_sel_cmd_support", &val); if (val) pinfo->flags |= delete_sel_cmd_support; fiid_obj_get (obj_cmd_rs, tmpl_get_sel_info_rs, - "overflow_flag", + (uint8_t *)"overflow_flag", &val); if (val) pinfo->flags |= overflow_flag; Index: libfreeipmi/src/ipmi-sel-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sel-cmds.c,v retrieving revision 1.9 diff -p -u -r1.9 ipmi-sel-cmds.c --- libfreeipmi/src/ipmi-sel-cmds.c 7 Jan 2006 03:24:32 -0000 1.9 +++ libfreeipmi/src/ipmi-sel-cmds.c 19 Jan 2006 13:35:51 -0000 @@ -145,7 +145,7 @@ fill_kcs_get_sel_info (fiid_obj_t obj_da { FIID_OBJ_SET (obj_data_rq, tmpl_get_sel_info_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SEL_DEV_CMDS_GET_SEL_INFO); return 0; } @@ -155,7 +155,7 @@ fill_kcs_get_sel_alloc_info (fiid_obj_t { FIID_OBJ_SET (obj_data_rq, tmpl_get_sel_alloc_info_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SEL_ALLOCATION_INFO); return 0; } @@ -165,7 +165,7 @@ fill_kcs_reserve_sel (fiid_obj_t obj_dat { FIID_OBJ_SET (obj_data_rq, tmpl_reserve_sel_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_RESERVE_SEL); return 0; } @@ -175,17 +175,17 @@ fill_kcs_get_sel_entry (fiid_obj_t obj_d { FIID_OBJ_SET (obj_data_rq, tmpl_get_sel_entry_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SEL_ENTRY); FIID_OBJ_SET (obj_data_rq, tmpl_get_sel_entry_rq, - "record_id", + (uint8_t *)"record_id", record_id); FIID_OBJ_SET (obj_data_rq, tmpl_get_sel_entry_rq, - "bytes_read", + (uint8_t *)"bytes_read", 0xff); return 0; @@ -198,17 +198,17 @@ fill_kcs_delete_sel_entry (fiid_obj_t ob { FIID_OBJ_SET (obj_data_rq, tmpl_delete_sel_entry_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_DELETE_SEL_ENTRY); FIID_OBJ_SET (obj_data_rq, tmpl_delete_sel_entry_rq, - "reservation_id", + (uint8_t *)"reservation_id", reservation_id); FIID_OBJ_SET (obj_data_rq, tmpl_delete_sel_entry_rq, - "record_id", + (uint8_t *)"record_id", record_id); return 0; @@ -219,32 +219,32 @@ fill_kcs_clear_sel (fiid_obj_t obj_data_ { FIID_OBJ_SET (obj_data_rq, tmpl_clear_sel_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_CLEAR_SEL); FIID_OBJ_SET (obj_data_rq, tmpl_clear_sel_rq, - "reservation_id", + (uint8_t *)"reservation_id", reservation_id); FIID_OBJ_SET (obj_data_rq, tmpl_clear_sel_rq, - "C", + (uint8_t *)"C", 'C'); FIID_OBJ_SET (obj_data_rq, tmpl_clear_sel_rq, - "L", + (uint8_t *)"L", 'L'); FIID_OBJ_SET (obj_data_rq, tmpl_clear_sel_rq, - "R", + (uint8_t *)"R", 'R'); FIID_OBJ_SET (obj_data_rq, tmpl_clear_sel_rq, - "opcode", + (uint8_t *)"opcode", opcode); return 0; Index: libfreeipmi/src/ipmi-sel-record-types.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sel-record-types.c,v retrieving revision 1.8 diff -p -u -r1.8 ipmi-sel-record-types.c --- libfreeipmi/src/ipmi-sel-record-types.c 16 Dec 2005 08:48:40 -0000 1.8 +++ libfreeipmi/src/ipmi-sel-record-types.c 19 Jan 2006 13:35:51 -0000 @@ -120,85 +120,85 @@ get_sel_system_event_record (uint8_t *re fiid_obj_get (record_data, tmpl_sel_system_event_record, - "record_id", + (uint8_t *)"record_id", &val); record_id = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "timestamp", + (uint8_t *)"timestamp", &val); timestamp = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "ipmb_slave_addr_sys_soft_id_flag", + (uint8_t *)"ipmb_slave_addr_sys_soft_id_flag", &val); ipmb_slave_addr_sys_soft_id_flag = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "ipmb_slave_addr_sys_soft_id", + (uint8_t *)"ipmb_slave_addr_sys_soft_id", &val); ipmb_slave_addr_sys_soft_id = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "channel_number", + (uint8_t *)"channel_number", &val); channel_number = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "sensor_type", + (uint8_t *)"sensor_type", &val); sensor_type = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "sensor_number", + (uint8_t *)"sensor_number", &val); sensor_number = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "event_type_code", + (uint8_t *)"event_type_code", &val); event_type_code = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "assertion_deassertion_event", + (uint8_t *)"assertion_deassertion_event", &val); assertion_deassertion_event = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "event_reading_code_offset", + (uint8_t *)"event_reading_code_offset", &val); event_reading_code_offset = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "event_data2_flag", + (uint8_t *)"event_data2_flag", &val); event_data2_flag = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "event_data3_flag", + (uint8_t *)"event_data3_flag", &val); event_data3_flag = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "event_data2", + (uint8_t *)"event_data2", &val); event_data2 = val; fiid_obj_get (record_data, tmpl_sel_system_event_record, - "event_data3", + (uint8_t *)"event_data3", &val); event_data3 = val; @@ -333,25 +333,25 @@ get_sel_timestamped_oem_record (uint8_t fiid_obj_get (record_data, tmpl_sel_timestamped_oem_record, - "record_id", + (uint8_t *)"record_id", &val); record_id = val; fiid_obj_get (record_data, tmpl_sel_timestamped_oem_record, - "timestamp", + (uint8_t *)"timestamp", &val); timestamp = val; fiid_obj_get (record_data, tmpl_sel_timestamped_oem_record, - "manufacturer_id", + (uint8_t *)"manufacturer_id", &val); manufacturer_id = val; fiid_obj_get (record_data, tmpl_sel_timestamped_oem_record, - "oem_defined", + (uint8_t *)"oem_defined", &val); oem_defined = val; @@ -369,7 +369,7 @@ get_sel_timestamped_oem_record (uint8_t "Manufacturer ID %02Xh", manufacturer_id); asprintf (&(sel_record->event_message), - "OEM Defined = %lXh", + "OEM Defined = " FI_64 "Xh", oem_defined); sel_record->event_data2_message = NULL; @@ -391,12 +391,12 @@ get_sel_non_timestamped_oem_record (uint fiid_obj_get (record_data, tmpl_sel_non_timestamped_oem_record, - "record_id", + (uint8_t *)"record_id", &val); record_id = val; oem_defined_index = fiid_obj_field_start_bytes (tmpl_sel_non_timestamped_oem_record, - "oem_defined"); + (uint8_t *)"oem_defined"); if (oem_defined_index == -1) return 1; oem_defined = record_data + oem_defined_index; @@ -442,7 +442,7 @@ get_sel_record (uint8_t *record_data, se fiid_obj_get (record_data, tmpl_sel_record_header, - "record_type", + (uint8_t *)"record_type", &val); record_type = val; Index: libfreeipmi/src/ipmi-sensor-api.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sensor-api.c,v retrieving revision 1.9 diff -p -u -r1.9 ipmi-sensor-api.c --- libfreeipmi/src/ipmi-sensor-api.c 16 Dec 2005 08:48:40 -0000 1.9 +++ libfreeipmi/src/ipmi-sensor-api.c 19 Jan 2006 13:35:52 -0000 @@ -39,14 +39,14 @@ get_sdr_full_record (uint8_t *sdr_record uint8_t record_length; fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "record_length", + (uint8_t *)"record_length", &val); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); ipmi_sensor_get_decode_params (sdr_record_data, &analog_data_format, &r_exponent, &b_exponent, - &linear, &b, &m); + (char *)&linear, &b, &m); sdr_full_record->b = b; sdr_full_record->m = m; sdr_full_record->r_exponent = r_exponent; @@ -56,37 +56,37 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "slave_system_software_id", + (uint8_t *)"slave_system_software_id", &val); sdr_full_record->slave_system_software_id = val; fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "sensor_number", + (uint8_t *)"sensor_number", &val); sdr_full_record->sensor_number = val; fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "sensor_type", + (uint8_t *)"sensor_type", &val); sdr_full_record->sensor_type = val; fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "event_reading_type", + (uint8_t *)"event_reading_type", &val); sdr_full_record->event_reading_type = val; fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "sensor_base_unit", + (uint8_t *)"sensor_base_unit", &val); sdr_full_record->sensor_unit = val; fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "nominal_reading", + (uint8_t *)"nominal_reading", &val); sdr_full_record->nominal_reading = ipmi_sensor_decode_value (r_exponent, @@ -99,7 +99,7 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "normal_min", + (uint8_t *)"normal_min", &val); sdr_full_record->normal_min = ipmi_sensor_decode_value (r_exponent, @@ -112,7 +112,7 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "normal_max", + (uint8_t *)"normal_max", &val); sdr_full_record->normal_max = ipmi_sensor_decode_value (r_exponent, @@ -125,7 +125,7 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "sensor_min_reading", + (uint8_t *)"sensor_min_reading", &val); sdr_full_record->sensor_min_reading = ipmi_sensor_decode_value (r_exponent, @@ -138,7 +138,7 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "sensor_max_reading", + (uint8_t *)"sensor_max_reading", &val); sdr_full_record->sensor_max_reading = ipmi_sensor_decode_value (r_exponent, @@ -151,19 +151,19 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "negative_hysteresis", + (uint8_t *)"negative_hysteresis", &val); sdr_full_record->negative_hysteresis = val; fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "positive_hysteresis", + (uint8_t *)"positive_hysteresis", &val); sdr_full_record->positive_hysteresis = val; fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "lower_non_recoverable_threshold", + (uint8_t *)"lower_non_recoverable_threshold", &val); sdr_full_record->lower_non_recoverable_threshold = ipmi_sensor_decode_value (r_exponent, @@ -176,7 +176,7 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "upper_non_recoverable_threshold", + (uint8_t *)"upper_non_recoverable_threshold", &val); sdr_full_record->upper_non_recoverable_threshold = ipmi_sensor_decode_value (r_exponent, @@ -189,7 +189,7 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "lower_critical_threshold", + (uint8_t *)"lower_critical_threshold", &val); sdr_full_record->lower_critical_threshold = ipmi_sensor_decode_value (r_exponent, @@ -202,7 +202,7 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "upper_critical_threshold", + (uint8_t *)"upper_critical_threshold", &val); sdr_full_record->upper_critical_threshold = ipmi_sensor_decode_value (r_exponent, @@ -215,7 +215,7 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "lower_non_critical_threshold", + (uint8_t *)"lower_non_critical_threshold", &val); sdr_full_record->lower_non_critical_threshold = ipmi_sensor_decode_value (r_exponent, @@ -228,7 +228,7 @@ get_sdr_full_record (uint8_t *sdr_record fiid_obj_get (sdr_record_data, tmpl_sdr_full_sensor_record, - "upper_non_critical_threshold", + (uint8_t *)"upper_non_critical_threshold", &val); sdr_full_record->upper_non_critical_threshold = ipmi_sensor_decode_value (r_exponent, @@ -240,7 +240,7 @@ get_sdr_full_record (uint8_t *sdr_record val); for (c = 0, i = fiid_obj_field_start_bytes (tmpl_sdr_full_sensor_record, - "sensor_id_string"); + (uint8_t *)"sensor_id_string"); i < record_length; i++, c++) sdr_full_record->sensor_name[c] = sdr_record_data[i]; @@ -260,55 +260,55 @@ get_sdr_compact_record (uint8_t *sdr_rec uint8_t record_length; fiid_obj_get (sdr_record_data, tmpl_sdr_compact_sensor_record, - "record_length", + (uint8_t *)"record_length", &val); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); fiid_obj_get (sdr_record_data, tmpl_sdr_compact_sensor_record, - "slave_system_software_id", + (uint8_t *)"slave_system_software_id", &val); sdr_compact_record->slave_system_software_id = val; fiid_obj_get (sdr_record_data, tmpl_sdr_compact_sensor_record, - "sensor_number", + (uint8_t *)"sensor_number", &val); sdr_compact_record->sensor_number = val; fiid_obj_get (sdr_record_data, tmpl_sdr_compact_sensor_record, - "sensor_type", + (uint8_t *)"sensor_type", &val); sdr_compact_record->sensor_type = val; fiid_obj_get (sdr_record_data, tmpl_sdr_compact_sensor_record, - "event_reading_type", + (uint8_t *)"event_reading_type", &val); sdr_compact_record->event_reading_type = val; fiid_obj_get (sdr_record_data, tmpl_sdr_compact_sensor_record, - "sensor_base_unit", + (uint8_t *)"sensor_base_unit", &val); sdr_compact_record->sensor_unit = val; fiid_obj_get (sdr_record_data, tmpl_sdr_compact_sensor_record, - "negative_hysteresis", + (uint8_t *)"negative_hysteresis", &val); sdr_compact_record->negative_hysteresis = val; fiid_obj_get (sdr_record_data, tmpl_sdr_compact_sensor_record, - "positive_hysteresis", + (uint8_t *)"positive_hysteresis", &val); sdr_compact_record->positive_hysteresis = val; for (c = 0, i = fiid_obj_field_start_bytes (tmpl_sdr_compact_sensor_record, - "sensor_id_string"); + (uint8_t *)"sensor_id_string"); i < record_length; i++, c++) sdr_compact_record->sensor_name[c] = sdr_record_data[i]; @@ -328,37 +328,37 @@ get_sdr_event_only_record (uint8_t *sdr_ uint8_t record_length; fiid_obj_get (sdr_record_data, tmpl_sdr_event_only_sensor_record, - "record_length", + (uint8_t *)"record_length", &val); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); fiid_obj_get (sdr_record_data, tmpl_sdr_compact_sensor_record, - "slave_system_software_id", + (uint8_t *)"slave_system_software_id", &val); sdr_event_only_record->slave_system_software_id = val; fiid_obj_get (sdr_record_data, tmpl_sdr_event_only_sensor_record, - "sensor_number", + (uint8_t *)"sensor_number", &val); sdr_event_only_record->sensor_number = val; fiid_obj_get (sdr_record_data, tmpl_sdr_event_only_sensor_record, - "sensor_type", + (uint8_t *)"sensor_type", &val); sdr_event_only_record->sensor_type = val; fiid_obj_get (sdr_record_data, tmpl_sdr_event_only_sensor_record, - "event_reading_type", + (uint8_t *)"event_reading_type", &val); sdr_event_only_record->event_reading_type = val; for (c = 0, i = fiid_obj_field_start_bytes (tmpl_sdr_event_only_sensor_record, - "sensor_id_string"); + (uint8_t *)"sensor_id_string"); i < record_length; i++, c++) sdr_event_only_record->sensor_name[c] = sdr_record_data[i]; @@ -375,13 +375,13 @@ get_sdr_entity_association_record (uint8 fiid_obj_get (sdr_record_data, tmpl_sdr_entity_association_sensor_record, - "container_entity_id", + (uint8_t *)"container_entity_id", &val); sdr_entity_association_record->container_entity_id = val; fiid_obj_get (sdr_record_data, tmpl_sdr_entity_association_sensor_record, - "container_entity_instance", + (uint8_t *)"container_entity_instance", &val); sdr_entity_association_record->container_entity_instance = val; @@ -399,73 +399,73 @@ get_sdr_generic_device_locator_record (u uint8_t record_length; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "record_length", + (uint8_t *)"record_length", &val); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "direct_access_address", + (uint8_t *)"direct_access_address", &val); sdr_generic_device_locator_record->direct_access_address = val; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "channel_number", + (uint8_t *)"channel_number", &val); sdr_generic_device_locator_record->channel_number = val; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "device_slave_address", + (uint8_t *)"device_slave_address", &val); sdr_generic_device_locator_record->device_slave_address = val; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "private_bus_id", + (uint8_t *)"private_bus_id", &val); sdr_generic_device_locator_record->private_bus_id = val; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "lun_master_write_read_command", + (uint8_t *)"lun_master_write_read_command", &val); sdr_generic_device_locator_record->lun_master_write_read_command = val; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "address_span", + (uint8_t *)"address_span", &val); sdr_generic_device_locator_record->address_span = val; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "device_type", + (uint8_t *)"device_type", &val); sdr_generic_device_locator_record->device_type = val; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "device_type_modifier", + (uint8_t *)"device_type_modifier", &val); sdr_generic_device_locator_record->device_type_modifier = val; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "entity_id", + (uint8_t *)"entity_id", &val); sdr_generic_device_locator_record->entity_id = val; fiid_obj_get (sdr_record_data, tmpl_generic_device_locator_sensor_record, - "entity_instance", + (uint8_t *)"entity_instance", &val); sdr_generic_device_locator_record->entity_instance = val; for (c = 0, i = fiid_obj_field_start_bytes (tmpl_generic_device_locator_sensor_record, - "device_id_string"); + (uint8_t *)"device_id_string"); i < record_length; i++, c++) sdr_generic_device_locator_record->device_name[c] = sdr_record_data[i]; @@ -485,37 +485,37 @@ get_sdr_logical_fru_device_locator_recor uint8_t record_length; fiid_obj_get (sdr_record_data, tmpl_sdr_logical_fru_device_locator_sensor_record, - "record_length", + (uint8_t *)"record_length", &val); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); fiid_obj_get (sdr_record_data, tmpl_sdr_logical_fru_device_locator_sensor_record, - "device_type", + (uint8_t *)"device_type", &val); sdr_logical_fru_device_locator_record->device_type = val; fiid_obj_get (sdr_record_data, tmpl_sdr_logical_fru_device_locator_sensor_record, - "device_type_modifier", + (uint8_t *)"device_type_modifier", &val); sdr_logical_fru_device_locator_record->device_type_modifier = val; fiid_obj_get (sdr_record_data, tmpl_sdr_logical_fru_device_locator_sensor_record, - "fru_entity_id", + (uint8_t *)"fru_entity_id", &val); sdr_logical_fru_device_locator_record->fru_entity_id = val; fiid_obj_get (sdr_record_data, tmpl_sdr_logical_fru_device_locator_sensor_record, - "fru_entity_instance", + (uint8_t *)"fru_entity_instance", &val); sdr_logical_fru_device_locator_record->fru_entity_instance = val; for (c = 0, i = fiid_obj_field_start_bytes (tmpl_sdr_logical_fru_device_locator_sensor_record, - "device_id_string"); + (uint8_t *)"device_id_string"); i < record_length; i++, c++) sdr_logical_fru_device_locator_record->device_name[c] = sdr_record_data[i]; @@ -535,24 +535,24 @@ get_sdr_management_controller_device_loc uint8_t record_length; fiid_obj_get (sdr_record_data, tmpl_sdr_management_controller_device_locator_sensor_record, - "record_length", + (uint8_t *)"record_length", &val); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); fiid_obj_get (sdr_record_data, tmpl_sdr_management_controller_device_locator_sensor_record, - "entity_id", + (uint8_t *)"entity_id", &val); sdr_management_controller_device_locator_record->entity_id = val; fiid_obj_get (sdr_record_data, tmpl_sdr_management_controller_device_locator_sensor_record, - "entity_instance", + (uint8_t *)"entity_instance", &val); sdr_management_controller_device_locator_record->entity_instance = val; - for (c = 0, i = fiid_obj_field_start_bytes (tmpl_sdr_management_controller_device_locator_sensor_record, "device_id_string"); + for (c = 0, i = fiid_obj_field_start_bytes (tmpl_sdr_management_controller_device_locator_sensor_record, (uint8_t *)"device_id_string"); i < record_length; i++, c++) sdr_management_controller_device_locator_record->device_name[c] = sdr_record_data[i]; @@ -572,19 +572,19 @@ get_sdr_oem_record (uint8_t *sdr_record_ uint8_t record_length; fiid_obj_get (sdr_record_data, tmpl_sdr_oem_record, - "record_length", + (uint8_t *)"record_length", &val); record_length = val; record_length += fiid_obj_len_bytes (tmpl_sdr_sensor_record_header); fiid_obj_get (sdr_record_data, tmpl_sdr_oem_record, - "manufacturer_id", + (uint8_t *)"manufacturer_id", &val); sdr_oem_record->manufacturer_id = val; for (c = 0, i = fiid_obj_field_start_bytes (tmpl_sdr_oem_record, - "oem_data"); + (uint8_t *)"oem_data"); i < record_length; i++, c++) sdr_oem_record->oem_data[c] = sdr_record_data[i]; @@ -617,19 +617,19 @@ get_sdr_record (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, tmpl_get_sdr_rs, - "next_record_id", + (uint8_t *)"next_record_id", &val); *next_record_id = val; fiid_obj_get (obj_sdr_record, tmpl_sdr_sensor_record_header, - "record_id", + (uint8_t *)"record_id", &val); sdr_record->record_id = val; fiid_obj_get (obj_sdr_record, tmpl_sdr_sensor_record_header, - "record_type", + (uint8_t *)"record_type", &val); sdr_record->record_type = val; @@ -657,32 +657,32 @@ get_sdr_record (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, tmpl_get_sensor_thresholds_rs, - "readable_lower_critical_threshold", + (uint8_t *)"readable_lower_critical_threshold", &val); sdr_record->record.sdr_full_record.readable_lower_critical_threshold = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sensor_thresholds_rs, - "readable_upper_critical_threshold", + (uint8_t *)"readable_upper_critical_threshold", &val); sdr_record->record.sdr_full_record.readable_upper_critical_threshold = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sensor_thresholds_rs, - "readable_lower_non_critical_threshold", + (uint8_t *)"readable_lower_non_critical_threshold", &val); sdr_record->record.sdr_full_record.readable_lower_non_critical_threshold = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sensor_thresholds_rs, - "readable_upper_non_critical_threshold", + (uint8_t *)"readable_upper_non_critical_threshold", &val); sdr_record->record.sdr_full_record.readable_upper_non_critical_threshold = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sensor_thresholds_rs, - "readable_lower_non_recoverable_threshold", + (uint8_t *)"readable_lower_non_recoverable_threshold", &val); sdr_record->record.sdr_full_record.readable_lower_non_recoverable_threshold = val; fiid_obj_get (obj_cmd_rs, tmpl_get_sensor_thresholds_rs, - "readable_upper_non_recoverable_threshold", + (uint8_t *)"readable_upper_non_recoverable_threshold", &val); sdr_record->record.sdr_full_record.readable_upper_non_recoverable_threshold = val; @@ -837,7 +837,7 @@ get_sensor_reading (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_threshold_reading_rs, - "sensor_reading", + (uint8_t *)"sensor_reading", &val); if (sdr_record->record_type == IPMI_SDR_FORMAT_FULL_RECORD) { @@ -856,23 +856,23 @@ get_sensor_reading (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_threshold_reading_rs, - "status_reading_availability", + (uint8_t *)"status_reading_availability", &val); sensor_reading->reading_availability_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_threshold_reading_rs, - "status_sensor_scanning", + (uint8_t *)"status_sensor_scanning", &val); sensor_reading->sensor_scanning_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_threshold_reading_rs, - "status_all_event_messages", + (uint8_t *)"status_all_event_messages", &val); sensor_reading->event_messages_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_threshold_reading_rs, - "sensor_state", + (uint8_t *)"sensor_state", &val); sensor_reading->event_message_list = ipmi_get_generic_event_message_list (event_reading_type, val); @@ -889,7 +889,7 @@ get_sensor_reading (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "sensor_reading", + (uint8_t *)"sensor_reading", &val); if (sdr_record->record_type == IPMI_SDR_FORMAT_FULL_RECORD) { @@ -908,23 +908,23 @@ get_sensor_reading (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "status_reading_availability", + (uint8_t *)"status_reading_availability", &val); sensor_reading->reading_availability_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "status_sensor_scanning", + (uint8_t *)"status_sensor_scanning", &val); sensor_reading->sensor_scanning_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "status_all_event_messages", + (uint8_t *)"status_all_event_messages", &val); sensor_reading->event_messages_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "sensor_state", + (uint8_t *)"sensor_state", &val); sensor_reading->event_message_list = ipmi_get_generic_event_message_list (event_reading_type, val); @@ -941,7 +941,7 @@ get_sensor_reading (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "sensor_reading", + (uint8_t *)"sensor_reading", &val); if (sdr_record->record_type == IPMI_SDR_FORMAT_FULL_RECORD) { @@ -960,23 +960,23 @@ get_sensor_reading (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "status_reading_availability", + (uint8_t *)"status_reading_availability", &val); sensor_reading->reading_availability_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "status_sensor_scanning", + (uint8_t *)"status_sensor_scanning", &val); sensor_reading->sensor_scanning_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "status_all_event_messages", + (uint8_t *)"status_all_event_messages", &val); sensor_reading->event_messages_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "sensor_state", + (uint8_t *)"sensor_state", &val); sensor_reading->event_message_list = ipmi_get_event_message_list (sensor_type, val); @@ -993,28 +993,28 @@ get_sensor_reading (ipmi_device_t *dev, fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "sensor_reading", + (uint8_t *)"sensor_reading", &val); sensor_reading->current_reading = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "status_reading_availability", + (uint8_t *)"status_reading_availability", &val); sensor_reading->reading_availability_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "status_sensor_scanning", + (uint8_t *)"status_sensor_scanning", &val); sensor_reading->sensor_scanning_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "status_all_event_messages", + (uint8_t *)"status_all_event_messages", &val); sensor_reading->event_messages_flag = val; fiid_obj_get (obj_cmd_rs, l_tmpl_get_sensor_discrete_reading_rs, - "sensor_state", + (uint8_t *)"sensor_state", &val); { char *event_message = NULL; Index: libfreeipmi/src/ipmi-sensor-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sensor-cmds.c,v retrieving revision 1.14 diff -p -u -r1.14 ipmi-sensor-cmds.c --- libfreeipmi/src/ipmi-sensor-cmds.c 7 Jan 2006 03:24:32 -0000 1.14 +++ libfreeipmi/src/ipmi-sensor-cmds.c 19 Jan 2006 13:35:52 -0000 @@ -727,12 +727,12 @@ fill_kcs_get_threshold_reading (fiid_obj { FIID_OBJ_SET (obj_data_rq, tmpl_get_sensor_threshold_reading_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SENSOR_READING); FIID_OBJ_SET (obj_data_rq, tmpl_get_sensor_threshold_reading_rq, - "sensor_number", + (uint8_t *)"sensor_number", sensor_number); return 0; @@ -743,12 +743,12 @@ fill_kcs_get_discrete_reading (fiid_obj_ { FIID_OBJ_SET (obj_data_rq, tmpl_get_sensor_discrete_reading_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SENSOR_READING); FIID_OBJ_SET (obj_data_rq, tmpl_get_sensor_discrete_reading_rq, - "sensor_number", + (uint8_t *)"sensor_number", sensor_number); return 0; @@ -759,12 +759,12 @@ fill_kcs_get_sensor_thresholds (fiid_obj { FIID_OBJ_SET (obj_data_rq, tmpl_get_sensor_thresholds_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SENSOR_THRESHOLDS); FIID_OBJ_SET (obj_data_rq, tmpl_get_sensor_thresholds_rq, - "sensor_number", + (uint8_t *)"sensor_number", sensor_number); return 0; Index: libfreeipmi/src/ipmi-sensor-event-messages.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sensor-event-messages.c,v retrieving revision 1.6 diff -p -u -r1.6 ipmi-sensor-event-messages.c --- libfreeipmi/src/ipmi-sensor-event-messages.c 16 Dec 2005 08:48:40 -0000 1.6 +++ libfreeipmi/src/ipmi-sensor-event-messages.c 19 Jan 2006 13:35:53 -0000 @@ -1062,9 +1062,9 @@ get_12_event_data2_message (int offset, char *str1 = NULL; char *str2 = NULL; - fiid_obj_get (&event_data, tmpl_event_data2, "log_type", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"log_type", &val); log_type = val; - fiid_obj_get (&event_data, tmpl_event_data2, "log_entry_action", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"log_entry_action", &val); log_entry_action = val; switch (log_type) @@ -1133,17 +1133,17 @@ get_12_event_data2_message (int offset, char *str = NULL; char *tmp_str = NULL; - fiid_obj_get (&event_data, tmpl_event_data2, "alert", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"alert", &val); alert = val; - fiid_obj_get (&event_data, tmpl_event_data2, "power_off", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"power_off", &val); power_off = val; - fiid_obj_get (&event_data, tmpl_event_data2, "reset", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"reset", &val); reset = val; - fiid_obj_get (&event_data, tmpl_event_data2, "power_cycle", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"power_cycle", &val); power_cycle = val; - fiid_obj_get (&event_data, tmpl_event_data2, "oem_action", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"oem_action", &val); oem_action = val; - fiid_obj_get (&event_data, tmpl_event_data2, "diagonstic_interrupt", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"diagonstic_interrupt", &val); diagnostic_interrupt = val; if (alert) @@ -1240,9 +1240,9 @@ get_12_event_data2_message (int offset, uint8_t first_second; char *str = NULL; - fiid_obj_get (&event_data, tmpl_event_data2, "timestamp_clock_type", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"timestamp_clock_type", &val); timestamp_clock_type = val; - fiid_obj_get (&event_data, tmpl_event_data2, "first_second", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"first_second", &val); first_second = val; asprintf (&str, "%s; %s", @@ -1309,7 +1309,7 @@ get_21_event_data2_message (int offset, }; uint64_t val; - fiid_obj_get (&event_data, tmpl_event_data2, "slot_connector_type", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"slot_connector_type", &val); switch (val) { @@ -1355,9 +1355,9 @@ get_23_event_data2_message (int offset, char *str1 = NULL; char *str2 = NULL; - fiid_obj_get (&event_data, tmpl_event_data2, "timer_at_expiration", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"timer_at_expiration", &val); timer_at_expiration = val; - fiid_obj_get (&event_data, tmpl_event_data2, "interrupt_type", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"interrupt_type", &val); interrupt_type = val; switch (timer_at_expiration) { @@ -1426,7 +1426,7 @@ get_2A_event_data2_message (int offset, uint64_t val; char *str = NULL; - fiid_obj_get (&event_data, tmpl_event_data2, "timer_at_expiration", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"timer_at_expiration", &val); if (val == 0x0) return strdup ("User ID for user that activated session = Unspecified"); asprintf (&str, "User ID for user that activated session = %d", (int) val); @@ -1513,9 +1513,9 @@ get_2C_event_data2_message (int offset, uint8_t cause_of_state_change; char *str = NULL; - fiid_obj_get (&event_data, tmpl_event_data2, "previous_state_offset", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"previous_state_offset", &val); previous_state_offset = val; - fiid_obj_get (&event_data, tmpl_event_data2, "cause_os_state_change", &val); + fiid_obj_get (&event_data, tmpl_event_data2, (uint8_t *)"cause_os_state_change", &val); cause_of_state_change = val; switch (cause_of_state_change) { @@ -1577,7 +1577,7 @@ get_08_event_data3_message (int offset, }; uint64_t val; - fiid_obj_get (&event_data, tmpl_event_data3, "event_type", &val); + fiid_obj_get (&event_data, tmpl_event_data3, (uint8_t *)"event_type", &val); switch (val) { case 0x0: @@ -1626,11 +1626,11 @@ get_10_event_data3_message (int offset, uint8_t logging_disabled_all_events; char *str = NULL; - fiid_obj_get (&event_data, tmpl_event_data3, "event_offset", &val); + fiid_obj_get (&event_data, tmpl_event_data3, (uint8_t *)"event_offset", &val); event_offset = val; - fiid_obj_get (&event_data, tmpl_event_data3, "assertion_deassertion_event", &val); + fiid_obj_get (&event_data, tmpl_event_data3, (uint8_t *)"assertion_deassertion_event", &val); assertion_deassertion_event = val; - fiid_obj_get (&event_data, tmpl_event_data3, "logging_disabled_all_events", &val); + fiid_obj_get (&event_data, tmpl_event_data3, (uint8_t *)"logging_disabled_all_events", &val); logging_disabled_all_events = val; asprintf (&str, "Event Offset %d; %s%s", event_offset, @@ -1722,9 +1722,9 @@ get_2A_event_data3_message (int offset, uint8_t deactivation_cause; char *str = NULL; - fiid_obj_get (&event_data, tmpl_event_data3, "channel_number", &val); + fiid_obj_get (&event_data, tmpl_event_data3, (uint8_t *)"channel_number", &val); channel_number = val; - fiid_obj_get (&event_data, tmpl_event_data3, "deactivation_cause", &val); + fiid_obj_get (&event_data, tmpl_event_data3, (uint8_t *)"deactivation_cause", &val); deactivation_cause = val; switch (deactivation_cause) Index: libfreeipmi/src/ipmi-sensor-types.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sensor-types.c,v retrieving revision 1.5 diff -p -u -r1.5 ipmi-sensor-types.c --- libfreeipmi/src/ipmi-sensor-types.c 16 Dec 2005 08:48:40 -0000 1.5 +++ libfreeipmi/src/ipmi-sensor-types.c 19 Jan 2006 13:35:54 -0000 @@ -822,42 +822,42 @@ ipmi_sensor_threshold_health_check (doub fiid_obj_get (data_rs, tmpl_get_sensor_threshold_reading_rs, - "status_comparison_lower_non_critical_threshold", + (uint8_t *)"status_comparison_lower_non_critical_threshold", &val); if (val == 1) return 0; fiid_obj_get (data_rs, tmpl_get_sensor_threshold_reading_rs, - "status_comparison_lower_critical_threshold", + (uint8_t *)"status_comparison_lower_critical_threshold", &val); if (val == 1) return 0; fiid_obj_get (data_rs, tmpl_get_sensor_threshold_reading_rs, - "status_comparison_lower_non_recoverable_threshold", + (uint8_t *)"status_comparison_lower_non_recoverable_threshold", &val); if (val == 1) return 0; fiid_obj_get (data_rs, tmpl_get_sensor_threshold_reading_rs, - "status_comparison_upper_non_critical_threshold", + (uint8_t *)"status_comparison_upper_non_critical_threshold", &val); if (val == 1) return 0; fiid_obj_get (data_rs, tmpl_get_sensor_threshold_reading_rs, - "status_comparison_upper_critical_threshold", + (uint8_t *)"status_comparison_upper_critical_threshold", &val); if (val == 1) return 0; fiid_obj_get (data_rs, tmpl_get_sensor_threshold_reading_rs, - "status_comparison_upper_non_recoverable_threshold", + (uint8_t *)"status_comparison_upper_non_recoverable_threshold", &val); if (val == 1) return 0; @@ -908,7 +908,7 @@ ipmi_sensor_discrete_health_check (int s { fiid_obj_get (data_rs, tmpl_get_sensor_discrete_reading_rs, - "state_7_asserted", + (uint8_t *)"state_7_asserted", &val); processor_present_flag = val; continue; @@ -918,7 +918,7 @@ ipmi_sensor_discrete_health_check (int s { fiid_obj_get (data_rs, tmpl_get_sensor_discrete_reading_rs, - "state_9_asserted", + (uint8_t *)"state_9_asserted", &val); terminator_present_flag = val; continue; @@ -927,7 +927,7 @@ ipmi_sensor_discrete_health_check (int s snprintf (key, 64, "state_%d_asserted", i); fiid_obj_get (data_rs, tmpl_get_sensor_discrete_reading_rs, - key, + (uint8_t *)key, &val); if (discrete_sensor_desc[i].normal_code != val) @@ -952,7 +952,7 @@ ipmi_sensor_discrete_health_check (int s { fiid_obj_get (data_rs, tmpl_get_sensor_discrete_reading_rs, - "state_2_asserted", + (uint8_t *)"state_2_asserted", &val); device_installed_flag = val; continue; @@ -962,7 +962,7 @@ ipmi_sensor_discrete_health_check (int s { fiid_obj_get (data_rs, tmpl_get_sensor_discrete_reading_rs, - "state_5_asserted", + (uint8_t *)"state_5_asserted", &val); power_off_flag = val; continue; @@ -971,7 +971,7 @@ ipmi_sensor_discrete_health_check (int s snprintf (key, 64, "state_%d_asserted", i); fiid_obj_get (data_rs, tmpl_get_sensor_discrete_reading_rs, - key, + (uint8_t *)key, &val); if (discrete_sensor_desc[i].normal_code != val) @@ -992,7 +992,7 @@ ipmi_sensor_discrete_health_check (int s snprintf (key, 64, "state_%d_asserted", i); fiid_obj_get (data_rs, tmpl_get_sensor_discrete_reading_rs, - key, + (uint8_t *)key, &val); if (discrete_sensor_desc[i].normal_code != val) Index: libfreeipmi/src/ipmi-sensor-utils.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sensor-utils.c,v retrieving revision 1.7 diff -p -u -r1.7 ipmi-sensor-utils.c --- libfreeipmi/src/ipmi-sensor-utils.c 16 Dec 2005 08:48:40 -0000 1.7 +++ libfreeipmi/src/ipmi-sensor-utils.c 19 Jan 2006 13:35:54 -0000 @@ -112,7 +112,7 @@ ipmi_sensor_get_decode_params_old (uint8 fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "r_exponent", + (uint8_t *)"r_exponent", &val); *r_exponent = (char) val; if (*r_exponent & 0x08) @@ -123,23 +123,23 @@ ipmi_sensor_get_decode_params_old (uint8 fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "b_exponent", + (uint8_t *)"b_exponent", &val); *b_exponent = (char) val; fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "linearization_enum", + (uint8_t *)"linearization_enum", &val); *linear = val; fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "m_ls", + (uint8_t *)"m_ls", &m_ls); fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "m_ms", + (uint8_t *)"m_ms", &m_ms); val = bits_merge (m_ls, 8, 10, m_ms); @@ -147,11 +147,11 @@ ipmi_sensor_get_decode_params_old (uint8 fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "b_ls", + (uint8_t *)"b_ls", &b_ls); fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "b_ms", + (uint8_t *)"b_ms", &b_ms); val = bits_merge (b_ls, 8, 10, b_ms); @@ -177,7 +177,7 @@ ipmi_sensor_get_decode_params (uint8_t * fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "r_exponent", + (uint8_t *)"r_exponent", &val); *r_exponent = (char) val; if (*r_exponent & 0x08) @@ -185,7 +185,7 @@ ipmi_sensor_get_decode_params (uint8_t * fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "b_exponent", + (uint8_t *)"b_exponent", &val); *b_exponent = (char) val; if (*b_exponent & 0x08) @@ -193,11 +193,11 @@ ipmi_sensor_get_decode_params (uint8_t * fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "m_ls", + (uint8_t *)"m_ls", &m_ls); fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "m_ms", + (uint8_t *)"m_ms", &m_ms); val = bits_merge (m_ls, 8, 10, m_ms); *m = (short) val; @@ -206,11 +206,11 @@ ipmi_sensor_get_decode_params (uint8_t * fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "b_ls", + (uint8_t *)"b_ls", &b_ls); fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "b_ms", + (uint8_t *)"b_ms", &b_ms); val = bits_merge (b_ls, 8, 10, b_ms); *b = (short) val; @@ -219,7 +219,7 @@ ipmi_sensor_get_decode_params (uint8_t * fiid_obj_get (sensor_record, tmpl_sdr_full_sensor_record, - "sensor_unit_analog_data_format", + (uint8_t *)"sensor_unit_analog_data_format", &val); *analog_data_format = (uint8_t) val; Index: libfreeipmi/src/ipmi-serial-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-serial-cmds.c,v retrieving revision 1.9 diff -p -u -r1.9 ipmi-serial-cmds.c --- libfreeipmi/src/ipmi-serial-cmds.c 11 Jan 2006 19:38:01 -0000 1.9 +++ libfreeipmi/src/ipmi-serial-cmds.c 19 Jan 2006 13:35:54 -0000 @@ -189,37 +189,37 @@ fill_set_serial_connmode (fiid_obj_t obj FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_connmode_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_SERIAL_MODEM_CONF_PARAM); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_connmode_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_connmode_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_SERIAL_PARAM_CONNECTION_MODE); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_connmode_rq, - "basic_mode_enable", + (uint8_t *)"basic_mode_enable", basic_mode_enable); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_connmode_rq, - "ppp_mode_enable", + (uint8_t *)"ppp_mode_enable", ppp_mode_enable); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_connmode_rq, - "terminal_mode_enable", + (uint8_t *)"terminal_mode_enable", terminal_mode_enable); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_connmode_rq, - "direct", + (uint8_t *)"direct", direct); return 0; @@ -239,22 +239,22 @@ fill_set_serial_page_blackout_interval ( FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_pageblackout_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_SERIAL_MODEM_CONF_PARAM); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_pageblackout_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_pageblackout_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_SERIAL_PARAM_PAGE_BLACKOUT_INTERVAL); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_pageblackout_rq, - "page_blackout_interval", + (uint8_t *)"page_blackout_interval", page_blackout_interval); return 0; @@ -274,22 +274,22 @@ fill_set_serial_retry_time (fiid_obj_t o FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_retry_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_SERIAL_MODEM_CONF_PARAM); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_retry_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_retry_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_SERIAL_PARAM_RETRY_TIME); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_retry_rq, - "retry_time", + (uint8_t *)"retry_time", retry_time); return 0; @@ -311,32 +311,32 @@ fill_set_serial_comm_bits (fiid_obj_t ob FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_commbits_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_SERIAL_MODEM_CONF_PARAM); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_commbits_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_commbits_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_SERIAL_PARAM_COMM_BITS); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_commbits_rq, - "dtr_hangup", + (uint8_t *)"dtr_hangup", dtr_hangup); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_commbits_rq, - "flow_control", + (uint8_t *)"flow_control", flow_control); FIID_OBJ_SET (obj_data_rq, tmpl_set_serial_conf_param_commbits_rq, - "bit_rate", + (uint8_t *)"bit_rate", bit_rate); return 0; @@ -359,32 +359,32 @@ fill_get_serial_conf_param (fiid_obj_t o FIID_OBJ_SET (obj_data_rq, tmpl_get_serial_conf_param_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SERIAL_MODEM_CONF_PARAM); FIID_OBJ_SET (obj_data_rq, tmpl_get_serial_conf_param_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_get_serial_conf_param_rq, - "parameter_type", + (uint8_t *)"parameter_type", parameter_type); FIID_OBJ_SET (obj_data_rq, tmpl_get_serial_conf_param_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", parameter_selector); FIID_OBJ_SET (obj_data_rq, tmpl_get_serial_conf_param_rq, - "set_selector", + (uint8_t *)"set_selector", set_selector); FIID_OBJ_SET (obj_data_rq, tmpl_get_serial_conf_param_rq, - "block_selector", + (uint8_t *)"block_selector", block_selector); return 0; Index: libfreeipmi/src/ipmi-sessions.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sessions.c,v retrieving revision 1.5 diff -p -u -r1.5 ipmi-sessions.c --- libfreeipmi/src/ipmi-sessions.c 16 Dec 2005 08:48:40 -0000 1.5 +++ libfreeipmi/src/ipmi-sessions.c 19 Jan 2006 13:35:54 -0000 @@ -60,16 +60,16 @@ fill_hdr_session (fiid_template_t tmpl_ return (-1); } - FIID_OBJ_SET (obj_hdr, tmpl_session, "auth_type", auth_type); - FIID_OBJ_SET (obj_hdr, tmpl_session, "session_seq_num", inbound_seq_num); - FIID_OBJ_SET (obj_hdr, tmpl_session, "session_id", session_id); + FIID_OBJ_SET (obj_hdr, tmpl_session, (uint8_t *)"auth_type", auth_type); + FIID_OBJ_SET (obj_hdr, tmpl_session, (uint8_t *)"session_seq_num", inbound_seq_num); + FIID_OBJ_SET (obj_hdr, tmpl_session, (uint8_t *)"session_id", session_id); if (auth_code_data && auth_code_data_len > 0 && (auth_type == IPMI_SESSION_AUTH_TYPE_MD2 || auth_type == IPMI_SESSION_AUTH_TYPE_MD5 || auth_type == IPMI_SESSION_AUTH_TYPE_STRAIGHT_PASSWD_KEY || auth_type == IPMI_SESSION_AUTH_TYPE_OEM_PROP)) { - if (fiid_obj_field_lookup (tmpl_session, "auth_code")) + if (fiid_obj_field_lookup (tmpl_session, (uint8_t *)"auth_code")) { /* achu: auth_code_data_len can be equal to * IPMI_SESSION_MAX_AUTH_CODE_LEN, null termination is not @@ -86,14 +86,14 @@ fill_hdr_session (fiid_template_t tmpl_ * completely cleared before setting anything. */ ERR_EXIT (fiid_obj_memset_field (obj_hdr, '\0', - tmpl_session, "auth_code") == 0); + tmpl_session, (uint8_t *)"auth_code") == 0); ERR_EXIT (fiid_obj_set_data (obj_hdr, tmpl_session, - "auth_code", + (uint8_t *)"auth_code", auth_code_data, auth_code_data_len) == 0); } - else if (fiid_obj_field_lookup (tmpl_session, "auth_calc_data")) + else if (fiid_obj_field_lookup (tmpl_session, (uint8_t *)"auth_calc_data")) { /* tmpl_hdr_session_auth_calc does not support all * authentication types @@ -107,7 +107,7 @@ fill_hdr_session (fiid_template_t tmpl_ return (-1); } - if (auth_code_data_len > fiid_obj_field_len_bytes (tmpl_session, "auth_calc_data")) + if (auth_code_data_len > fiid_obj_field_len_bytes (tmpl_session, (uint8_t *)"auth_calc_data")) { errno = EINVAL; return (-1); @@ -118,10 +118,10 @@ fill_hdr_session (fiid_template_t tmpl_ * completely cleared before setting anything. */ ERR_EXIT (fiid_obj_memset_field (obj_hdr, '\0', - tmpl_session, "auth_calc_data") == 0); + tmpl_session, (uint8_t *)"auth_calc_data") == 0); ERR_EXIT (fiid_obj_set_data (obj_hdr, tmpl_session, - "auth_calc_data", + (uint8_t *)"auth_calc_data", auth_code_data, auth_code_data_len) == 0); } @@ -135,7 +135,7 @@ fill_hdr_session (fiid_template_t tmpl_ } } - FIID_OBJ_SET (obj_hdr, tmpl_session, "ipmi_msg_len", + FIID_OBJ_SET (obj_hdr, tmpl_session, (uint8_t *)"ipmi_msg_len", (fiid_obj_len_bytes (tmpl_lan_msg_hdr_rq) + fiid_obj_len_bytes (tmpl_cmd) + fiid_obj_len_bytes (tmpl_lan_msg_trlr))); @@ -154,13 +154,13 @@ check_hdr_session_session_seq_num (fiid_ return (-1); } - if (!fiid_obj_field_lookup (tmpl_hdr_session, "session_seq_num")) + if (!fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"session_seq_num")) { errno = EINVAL; return (-1); } - FIID_OBJ_GET(obj_hdr_session, tmpl_hdr_session, "session_seq_num", &session_seq_num_recv); + FIID_OBJ_GET(obj_hdr_session, tmpl_hdr_session, (uint8_t *)"session_seq_num", &session_seq_num_recv); return ((((int32_t)session_seq_num_recv) == session_seq_num) ? 1 : 0); } @@ -176,13 +176,13 @@ check_hdr_session_session_id (fiid_templ return (-1); } - if (!fiid_obj_field_lookup (tmpl_hdr_session, "session_id")) + if (!fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"session_id")) { errno = EINVAL; return (-1); } - FIID_OBJ_GET(obj_hdr_session, tmpl_hdr_session, "session_id", &session_id_recv); + FIID_OBJ_GET(obj_hdr_session, tmpl_hdr_session, (uint8_t *)"session_id", &session_id_recv); return ((((int32_t)session_id_recv) == session_id) ? 1 : 0); } @@ -200,15 +200,15 @@ check_hdr_session_authcode (uint8_t *pkt return (-1); } - if (!fiid_obj_field_lookup (tmpl_hdr_session, "auth_type") - || !fiid_obj_field_lookup (tmpl_hdr_session, "session_id") - || !fiid_obj_field_lookup (tmpl_hdr_session, "session_seq_num")) + if (!fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"auth_type") + || !fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"session_id") + || !fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"session_seq_num")) { errno = EINVAL; return (-1); } - auth_type_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session, "auth_type"); + auth_type_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"auth_type"); if (pkt_len < auth_type_offset) return 0; @@ -223,20 +223,20 @@ check_hdr_session_authcode (uint8_t *pkt return 1; /* Don't use passed in session template, use tmpl_hdr_session_auth */ - auth_code_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session_auth, "auth_code"); + auth_code_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session_auth, (uint8_t *)"auth_code"); if (pkt_len < (auth_code_offset + IPMI_SESSION_MAX_AUTH_CODE_LEN)) return 0; memset(auth_code_buf, '\0', IPMI_SESSION_MAX_AUTH_CODE_LEN); - if (fiid_obj_field_lookup (tmpl_hdr_session, "auth_code")) + if (fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"auth_code")) { - ERR_EXIT(fiid_obj_field_len_bytes (tmpl_hdr_session, "auth_code") == IPMI_SESSION_MAX_AUTH_CODE_LEN); + ERR_EXIT(fiid_obj_field_len_bytes (tmpl_hdr_session, (uint8_t *)"auth_code") == IPMI_SESSION_MAX_AUTH_CODE_LEN); if (auth_code_data) memcpy(auth_code_buf, auth_code_data, auth_code_data_len); } - else if (fiid_obj_field_lookup (tmpl_hdr_session, "auth_calc_data")) + else if (fiid_obj_field_lookup (tmpl_hdr_session, (uint8_t *)"auth_calc_data")) { if (auth_type == IPMI_SESSION_AUTH_TYPE_MD2 || auth_type == IPMI_SESSION_AUTH_TYPE_MD5) @@ -244,8 +244,8 @@ check_hdr_session_authcode (uint8_t *pkt uint8_t pwbuf[IPMI_SESSION_MAX_AUTH_CODE_LEN]; uint32_t session_id_offset, session_seq_num_offset, data_offset; - session_id_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session, "session_id"); - session_seq_num_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session, "session_seq_num"); + session_id_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"session_id"); + session_seq_num_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_field_start_bytes (tmpl_hdr_session, (uint8_t *)"session_seq_num"); data_offset = fiid_obj_len_bytes (tmpl_hdr_rmcp) + fiid_obj_len_bytes (tmpl_hdr_session_auth); if (pkt_len < session_id_offset @@ -270,14 +270,14 @@ check_hdr_session_authcode (uint8_t *pkt ipmi_md2_update_data(&ctx, pkt + session_id_offset, fiid_obj_field_len_bytes (tmpl_hdr_session, - "session_id")); + (uint8_t *)"session_id")); ipmi_md2_update_data(&ctx, pkt + data_offset, pkt_len - data_offset); ipmi_md2_update_data(&ctx, pkt + session_seq_num_offset, fiid_obj_field_len_bytes (tmpl_hdr_session, - "session_seq_num")); + (uint8_t *)"session_seq_num")); ipmi_md2_update_data(&ctx, pwbuf, IPMI_SESSION_MAX_AUTH_CODE_LEN); ipmi_md2_finish(&ctx, auth_code_buf, IPMI_SESSION_MAX_AUTH_CODE_LEN); } @@ -292,14 +292,14 @@ check_hdr_session_authcode (uint8_t *pkt ipmi_md5_update_data(&ctx, pkt + session_id_offset, fiid_obj_field_len_bytes (tmpl_hdr_session, - "session_id")); + (uint8_t *)"session_id")); ipmi_md5_update_data(&ctx, pkt + data_offset, pkt_len - data_offset); ipmi_md5_update_data(&ctx, pkt + session_seq_num_offset, fiid_obj_field_len_bytes (tmpl_hdr_session, - "session_seq_num")); + (uint8_t *)"session_seq_num")); ipmi_md5_update_data(&ctx, pwbuf, IPMI_SESSION_MAX_AUTH_CODE_LEN); ipmi_md5_finish(&ctx, auth_code_buf, IPMI_SESSION_MAX_AUTH_CODE_LEN); Index: libfreeipmi/src/ipmi-sol-cmds.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-sol-cmds.c,v retrieving revision 1.9 diff -p -u -r1.9 ipmi-sol-cmds.c --- libfreeipmi/src/ipmi-sol-cmds.c 11 Jan 2006 19:38:01 -0000 1.9 +++ libfreeipmi/src/ipmi-sol-cmds.c 19 Jan 2006 13:35:54 -0000 @@ -76,22 +76,22 @@ fill_sol_conf_sol_enable_disable (fiid_o { FIID_OBJ_SET (obj_data_rq, tmpl_set_sol_conf_param_sol_enable_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_SET_SOL_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_set_sol_conf_param_sol_enable_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_set_sol_conf_param_sol_enable_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", IPMI_SOL_PARAM_SELECTOR_SOL_ENABLE); FIID_OBJ_SET (obj_data_rq, tmpl_set_sol_conf_param_sol_enable_rq, - "sol_payload", + (uint8_t *)"sol_payload", sol_payload); return 0; @@ -107,32 +107,32 @@ fill_get_sol_conf_param (fiid_obj_t obj_ { FIID_OBJ_SET (obj_data_rq, tmpl_get_sol_conf_param_rq, - "cmd", + (uint8_t *)"cmd", IPMI_CMD_GET_SOL_CONF_PARAMS); FIID_OBJ_SET (obj_data_rq, tmpl_get_sol_conf_param_rq, - "channel_number", + (uint8_t *)"channel_number", channel_number); FIID_OBJ_SET (obj_data_rq, tmpl_get_sol_conf_param_rq, - "parameter_type", + (uint8_t *)"parameter_type", parameter_type); FIID_OBJ_SET (obj_data_rq, tmpl_get_sol_conf_param_rq, - "parameter_selector", + (uint8_t *)"parameter_selector", parameter_selector); FIID_OBJ_SET (obj_data_rq, tmpl_get_sol_conf_param_rq, - "set_selector", + (uint8_t *)"set_selector", set_selector); FIID_OBJ_SET (obj_data_rq, tmpl_get_sol_conf_param_rq, - "block_selector", + (uint8_t *)"block_selector", block_selector); return 0; Index: libfreeipmi/src/ipmi-ssif-interface.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-ssif-interface.c,v retrieving revision 1.7 diff -p -u -r1.7 ipmi-ssif-interface.c --- libfreeipmi/src/ipmi-ssif-interface.c 4 Jan 2006 14:27:10 -0000 1.7 +++ libfreeipmi/src/ipmi-ssif-interface.c 19 Jan 2006 13:35:55 -0000 @@ -112,7 +112,7 @@ ipmi_ssif_write (int i2c_fd, char *buf, { int bytes_written; - bytes_written = ipmi_i2c_smbus_write_block_data (i2c_fd, IPMI_SSIF_SMB_IPMI_REQUEST, len, buf); + bytes_written = ipmi_i2c_smbus_write_block_data (i2c_fd, IPMI_SSIF_SMB_IPMI_REQUEST, len, (uint8_t *)buf); if (bytes_written == 0) return (-1); else @@ -124,7 +124,7 @@ ipmi_ssif_read (int i2c_fd, char *buf, s { int bytes_read; - bytes_read = ipmi_i2c_smbus_read_block_data (i2c_fd, IPMI_SSIF_SMB_IPMI_RESPONSE, buf); + bytes_read = ipmi_i2c_smbus_read_block_data (i2c_fd, IPMI_SSIF_SMB_IPMI_RESPONSE, (uint8_t *)buf); if (bytes_read == 0) return (-1); else @@ -169,13 +169,13 @@ ipmi_ssif_cmd2 (ipmi_device_t *dev, pkt, pkt_len) > 0); - ERR (ipmi_ssif_write (dev->io.inband.dev_fd, pkt, pkt_len) != -1); + ERR (ipmi_ssif_write (dev->io.inband.dev_fd, (char *)pkt, pkt_len) != -1); } { uint8_t *pkt; uint32_t pkt_len; - uint32_t bytes_read = 0; + size_t bytes_read = 0; pkt_len = fiid_obj_len_bytes (*(dev->io.inband.rs.tmpl_hdr_ptr)) + fiid_obj_len_bytes (tmpl_cmd_rs); @@ -183,7 +183,7 @@ ipmi_ssif_cmd2 (ipmi_device_t *dev, memset (pkt, 0, pkt_len); ERR (pkt); - ERR (ipmi_ssif_read (dev->io.inband.dev_fd, pkt, &bytes_read) != -1); + ERR (ipmi_ssif_read (dev->io.inband.dev_fd, (char *)pkt, &bytes_read) != -1); if (bytes_read != pkt_len) { int i; @@ -192,7 +192,7 @@ ipmi_ssif_cmd2 (ipmi_device_t *dev, fprintf (stderr, "received packet size: %d\n" "expected packet size: %d\n", - bytes_read, + (int)bytes_read, pkt_len); fprintf (stderr, "packet data:\n"); for (i = 0; i < bytes_read; i++) @@ -227,7 +227,7 @@ ipmi_ssif_cmd_raw2 (ipmi_device_t *dev, { /* Request Block */ - ERR (ipmi_ssif_write (dev->io.inband.dev_fd, buf_rq, buf_rq_len) != -1); + ERR (ipmi_ssif_write (dev->io.inband.dev_fd, (char *)buf_rq, buf_rq_len) != -1); } { @@ -235,7 +235,7 @@ ipmi_ssif_cmd_raw2 (ipmi_device_t *dev, uint32_t bytes_read = 0; ERR ((bytes_read = ipmi_ssif_read (dev->io.inband.dev_fd, - buf_rs, *buf_rs_len)) != -1); + (char *)buf_rs, buf_rs_len)) != -1); *buf_rs_len = bytes_read; } Index: libfreeipmi/src/ipmi-watchdog.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/ipmi-watchdog.c,v retrieving revision 1.6 diff -p -u -r1.6 ipmi-watchdog.c --- libfreeipmi/src/ipmi-watchdog.c 16 Dec 2005 08:48:40 -0000 1.6 +++ libfreeipmi/src/ipmi-watchdog.c 19 Jan 2006 13:35:55 -0000 @@ -129,7 +129,7 @@ fill_cmd_reset_watchdog_timer (fiid_obj_ return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_reset_watchdog_timer_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_reset_watchdog_timer_rq, (uint8_t *)"cmd", IPMI_CMD_RESET_WATCHDOG_TIMER); return (0); } @@ -148,21 +148,21 @@ fill_cmd_set_watchdog_timer (uint8_t tim return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"cmd", IPMI_CMD_SET_WATCHDOG_TIMER); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "log", log); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "stop_timer", stop_timer); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "timer_use", timer_use); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "pre_timeout_interrupt", pre_timeout_interrupt); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "timeout_action", timeout_action); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "pre_timeout_interval", pre_timeout_interval); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "timer_use_expiration_flag_oem", timer_use_expiration_flag_oem); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "timer_use_expiration_flag_sms_os", timer_use_expiration_flag_sms_os); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "timer_use_expiration_flag_os_load", timer_use_expiration_flag_os_load); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "timer_use_expiration_flag_bios_post", timer_use_expiration_flag_bios_post); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "timer_use_expiration_flag_bios_frb2", timer_use_expiration_flag_bios_frb2); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "initial_countdown_value_ls_byte", initial_countdown_value_ls_byte); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, "initial_countdown_value_ms_byte", initial_countdown_value_ms_byte); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"log", log); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"stop_timer", stop_timer); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"timer_use", timer_use); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"pre_timeout_interrupt", pre_timeout_interrupt); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"timeout_action", timeout_action); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"pre_timeout_interval", pre_timeout_interval); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"timer_use_expiration_flag_oem", timer_use_expiration_flag_oem); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"timer_use_expiration_flag_sms_os", timer_use_expiration_flag_sms_os); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"timer_use_expiration_flag_os_load", timer_use_expiration_flag_os_load); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"timer_use_expiration_flag_bios_post", timer_use_expiration_flag_bios_post); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"timer_use_expiration_flag_bios_frb2", timer_use_expiration_flag_bios_frb2); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"initial_countdown_value_ls_byte", initial_countdown_value_ls_byte); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_set_watchdog_timer_rq, (uint8_t *)"initial_countdown_value_ms_byte", initial_countdown_value_ms_byte); return (0); } @@ -176,7 +176,7 @@ fill_cmd_get_watchdog_timer (fiid_obj_t return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_watchdog_timer_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_get_watchdog_timer_rq, (uint8_t *)"cmd", IPMI_CMD_GET_WATCHDOG_TIMER); return (0); } @@ -195,13 +195,13 @@ fill_cmd_suspend_bmc_arps (uint8_t chann return (-1); } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_suspend_bmc_arps_rq, "cmd", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_suspend_bmc_arps_rq, (uint8_t *)"cmd", IPMI_CMD_SUSPEND_BMC_ARPS); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_suspend_bmc_arps_rq, "channel_number", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_suspend_bmc_arps_rq, (uint8_t *)"channel_number", channel_number); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_suspend_bmc_arps_rq, "gratuitous_arp_suspend", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_suspend_bmc_arps_rq, (uint8_t *)"gratuitous_arp_suspend", gratuitous_arp_suspend); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_suspend_bmc_arps_rq, "arp_response_suspend", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_suspend_bmc_arps_rq, (uint8_t *)"arp_response_suspend", arp_response_suspend); return (0); Index: libfreeipmi/src/rmcp.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/libfreeipmi/src/rmcp.c,v retrieving revision 1.6 diff -p -u -r1.6 rmcp.c --- libfreeipmi/src/rmcp.c 16 Dec 2005 08:48:40 -0000 1.6 +++ libfreeipmi/src/rmcp.c 19 Jan 2006 13:35:55 -0000 @@ -71,13 +71,13 @@ fill_hdr_rmcp (uint8_t message_class, fi hdr_len = fiid_obj_len_bytes (tmpl_hdr_rmcp); - FIID_OBJ_SET (obj_hdr, tmpl_hdr_rmcp, "ver", + FIID_OBJ_SET (obj_hdr, tmpl_hdr_rmcp, (uint8_t *)"ver", RMCP_VER_1_0); - FIID_OBJ_SET (obj_hdr, tmpl_hdr_rmcp, "seq_num", + FIID_OBJ_SET (obj_hdr, tmpl_hdr_rmcp, (uint8_t *)"seq_num", RMCP_HDR_SEQ_NUM_NO_RMCP_ACK); - FIID_OBJ_SET (obj_hdr, tmpl_hdr_rmcp, "msg_class.class", + FIID_OBJ_SET (obj_hdr, tmpl_hdr_rmcp, (uint8_t *)"msg_class.class", message_class); - FIID_OBJ_SET (obj_hdr, tmpl_hdr_rmcp, "msg_class.ack", + FIID_OBJ_SET (obj_hdr, tmpl_hdr_rmcp, (uint8_t *)"msg_class.ack", RMCP_HDR_MSG_CLASS_BIT_RMCP_NORMAL); return 0; } @@ -102,12 +102,12 @@ fill_cmd_asf_presence_ping(uint8_t msg_t errno = EINVAL; return -1; } - FIID_OBJ_SET (obj_cmd, tmpl_cmd_asf_presence_ping, "iana_enterprise_num", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_asf_presence_ping, (uint8_t *)"iana_enterprise_num", htonl(RMCP_ASF_IANA_ENTERPRISE_NUM)); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_asf_presence_ping, "msg_type", + FIID_OBJ_SET (obj_cmd, tmpl_cmd_asf_presence_ping, (uint8_t *)"msg_type", RMCP_ASF_MSG_TYPE_PRESENCE_PING); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_asf_presence_ping, "msg_tag", msg_tag); - FIID_OBJ_SET (obj_cmd, tmpl_cmd_asf_presence_ping, "data_len", 0x00); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_asf_presence_ping, (uint8_t *)"msg_tag", msg_tag); + FIID_OBJ_SET (obj_cmd, tmpl_cmd_asf_presence_ping, (uint8_t *)"data_len", 0x00); return 0; } @@ -255,7 +255,7 @@ ipmi_rmcp_msg_tag_chk (uint8_t msg_tag, if (!pong) return -1; - fiid_obj_get (pong, tmpl_cmd_asf_presence_pong, "msg_tag", &val); + fiid_obj_get (pong, tmpl_cmd_asf_presence_pong, (uint8_t *)"msg_tag", &val); if (msg_tag == val) return 1; else Index: rmcpping/src/rmcpping.c =================================================================== RCS file: /cvsroot/freeipmi/freeipmi/rmcpping/src/rmcpping.c,v retrieving revision 1.4 diff -p -u -r1.4 rmcpping.c --- rmcpping/src/rmcpping.c 16 Dec 2005 08:48:40 -0000 1.4 +++ rmcpping/src/rmcpping.c 19 Jan 2006 13:35:55 -0000 @@ -104,7 +104,7 @@ createpacket(char *buffer, if ((len = assemble_rmcp_pkt(obj_rmcp_hdr, obj_rmcp_cmd, tmpl_cmd_asf_presence_ping, - buffer, buflen)) < 0) + (uint8_t *)buffer, buflen)) < 0) ipmi_ping_err_exit("assemble_rmcp_pkt: %s", strerror(errno)); #ifndef NDEBUG @@ -157,7 +157,7 @@ parsepacket(char *buffer, ipmi_ping_err_exit("unassemble_rmcp_pkt: %s", strerror(errno)); Fiid_obj_get(obj_rmcp_cmd, tmpl_cmd_asf_presence_pong, - "msg_type", (uint64_t *)&msg_type); + (uint8_t *)"msg_type", (uint64_t *)&msg_type); if (msg_type != RMCP_ASF_MSG_TYPE_PRESENCE_PONG) { @@ -166,7 +166,7 @@ parsepacket(char *buffer, } Fiid_obj_get(obj_rmcp_cmd, tmpl_cmd_asf_presence_pong, - "msg_tag", (uint64_t *)&msg_tag); + (uint8_t *)"msg_tag", (uint64_t *)&msg_tag); if (msg_tag != (seq_num % (RMCP_MSG_TAG_MAX + 1))) { retval = 0; @@ -177,7 +177,7 @@ parsepacket(char *buffer, if (verbose) { Fiid_obj_get(obj_rmcp_cmd, tmpl_cmd_asf_presence_pong, - "supported_entities.ipmi_supported", + (uint8_t *)"supported_entities.ipmi_supported", (uint64_t *)&ipmi_supported); printf(", ipmi %s", _supported(ipmi_supported)); }