Use "#pragma once" for headers

Some of the header guard names in ipmitool duplicated with the ones in
freeipmi.

* ipmitool/ipmi_fru.h and freeipmi/fru/ipmi-fru.h both uses IPMI_FRU_H
* ipmitool/ipmi_sdr.h and freeipmi/sdr/ipmi-sdr.h both uses IPMI_SDR_H
* ipmitool/ipmi_sel.h and freeipmi/sel/ipmi-sel.h both uses IPMI_SEL_H

This is problematic as including the 1st will prevent the 2nd from being
included, leading to the loss of any declarations, inline definitions,
or other "#includes" in the 2nd header.

For example, including ipmitool/ipmi_sel.h and freeipmi/freeipmi.h fails
to build.

$ cat test.c
 #include <ipmitool/ipmi_sel.h>
 #include <freeipmi/freeipmi.h>
$ gcc test.c -I${HOME}/src/oss/ipmitool/include
In file included from /usr/include/freeipmi/freeipmi.h:90,
                 from test.c:2:
/usr/include/freeipmi/sdr/oem/ipmi-sdr-oem-intel-node-manager.h:48:44: error: unknown type name 'ipmi_sdr_ctx_t'; did you mean 'ipmi_fru_ctx_t'?
   48 | int ipmi_sdr_oem_parse_intel_node_manager (ipmi_sdr_ctx_t ctx,
      |                                            ^~~~~~~~~~~~~~
      |                                            ipmi_fru_ctx_t

Remove header guards and use "#pragma once" instead. In this way, we
don't have to do manual management to avoid name clashes.
* src/plugins/lan/md5.h is left as is being an external header
  originally.
* src/plugins/imb/imbapi.h is a convoluted header consisting of multiple
  header guards. Let's just add "#pragma once" and leave header guards
  as is for now.

Signed-off-by: Bing-Hua Wang <binghuawang@ami.com>
This commit is contained in:
Bing-Hua Wang 2020-11-13 13:35:25 +08:00 committed by Alexander Amelkin
parent 682fec09ef
commit 5a36080f92
62 changed files with 70 additions and 253 deletions

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_BSWAP_H #pragma once
#define IPMI_BSWAP_H
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -49,5 +48,3 @@
# define BSWAP_32(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) |\ # define BSWAP_32(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) |\
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
#endif #endif
#endif /* IPMI_BSWAP_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_HELPER_H #pragma once
#define IPMI_HELPER_H
#include <sys/types.h> #include <sys/types.h>
#include <inttypes.h> #include <inttypes.h>
@ -227,5 +226,3 @@ uint8_t *array_letoh(uint8_t *buffer, size_t length);
#ifndef __maxlen #ifndef __maxlen
# define __maxlen(a, b) ({ int x=strlen(a); int y=strlen(b); (x > y) ? x : y;}) # define __maxlen(a, b) ({ int x=strlen(a); int y=strlen(b); (x > y) ? x : y;})
#endif #endif
#endif /* IPMI_HELPER_H */

View File

@ -30,6 +30,8 @@
* EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#pragma once
#include <stdint.h> #include <stdint.h>
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_H #pragma once
#define IPMI_H
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@ -307,5 +306,3 @@ typedef enum IPMI_OEM {
} IPMI_OEM; } IPMI_OEM;
extern const struct valstr completion_code_vals[]; extern const struct valstr completion_code_vals[];
#endif /* IPMI_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_CC_H #pragma once
#define IPMI_CC_H
/* /*
Thu Jan 11 09:32:41 2007 Thu Jan 11 09:32:41 2007
@ -71,6 +70,3 @@
#define IPMI_CC_NOT_SUPPORTED_PRESENT_STATE 0xd5 #define IPMI_CC_NOT_SUPPORTED_PRESENT_STATE 0xd5
#define IPMI_CC_ILLEGAL_COMMAND_DISABLED 0xd6 #define IPMI_CC_ILLEGAL_COMMAND_DISABLED 0xd6
#define IPMI_CC_UNSPECIFIED_ERROR 0xff #define IPMI_CC_UNSPECIFIED_ERROR 0xff
#endif /*IPMI_CC_H*/

View File

@ -29,8 +29,8 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef IPMI_CFGP_H
#define IPMI_CFGP_H #pragma once
#include <stdio.h> #include <stdio.h>
@ -193,5 +193,3 @@ extern int ipmi_cfgp_save(struct ipmi_cfgp_ctx *ctx,
/* Print parameter data in user-friendly format. */ /* Print parameter data in user-friendly format. */
extern int ipmi_cfgp_print(struct ipmi_cfgp_ctx *ctx, extern int ipmi_cfgp_print(struct ipmi_cfgp_ctx *ctx,
const struct ipmi_cfgp_sel *sel, FILE *file); const struct ipmi_cfgp_sel *sel, FILE *file);
#endif /* IPMI_CFGP_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_CHANNEL_H #pragma once
#define IPMI_CHANNEL_H
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -217,5 +216,3 @@ int ipmi_channel_main(struct ipmi_intf * intf, int argc, char ** argv);
int ipmi_get_channel_auth_cap(struct ipmi_intf * intf, int ipmi_get_channel_auth_cap(struct ipmi_intf * intf,
uint8_t channel, uint8_t priv); uint8_t channel, uint8_t priv);
int ipmi_get_channel_info(struct ipmi_intf * intf, uint8_t channel); int ipmi_get_channel_info(struct ipmi_intf * intf, uint8_t channel);
#endif /*IPMI_CHANNEL_H*/

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_CHASSIS_H #pragma once
#define IPMI_CHASSIS_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -51,5 +50,3 @@ int ipmi_chassis_power_status(struct ipmi_intf * intf);
int ipmi_chassis_power_control(struct ipmi_intf * intf, uint8_t ctl); int ipmi_chassis_power_control(struct ipmi_intf * intf, uint8_t ctl);
int ipmi_chassis_main(struct ipmi_intf * intf, int argc, char ** argv); int ipmi_chassis_main(struct ipmi_intf * intf, int argc, char ** argv);
int ipmi_power_main(struct ipmi_intf * intf, int argc, char ** argv); int ipmi_power_main(struct ipmi_intf * intf, int argc, char ** argv);
#endif /*IPMI_CHASSIS_H*/

View File

@ -30,9 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_CONSTANTS_H #pragma once
#define IPMI_CONSTANTS_H
/* /*
* COMMANDS * COMMANDS
@ -133,5 +131,3 @@
#define IPMI_CRYPT_AES_CBC_128 0x01 #define IPMI_CRYPT_AES_CBC_128 0x01
#define IPMI_CRYPT_XRC4_128 0x02 #define IPMI_CRYPT_XRC4_128 0x02
#define IPMI_CRYPT_XRC4_40 0x03 #define IPMI_CRYPT_XRC4_40 0x03
#endif /*IPMI_CONSTANTS_H*/

View File

@ -16,9 +16,7 @@
* *
*/ */
#pragma once
#ifndef IPMI_DCMI_H
#define IPMI_DCMI_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -267,4 +265,3 @@ struct nm_suspend {
} __attribute__ ((packed)); } __attribute__ ((packed));
int ipmi_nm_main(struct ipmi_intf * intf, int argc, char ** argv); int ipmi_nm_main(struct ipmi_intf * intf, int argc, char ** argv);
#endif /*IPMI_DCMI_H*/

View File

@ -26,8 +26,8 @@ POSSIBILITY OF SUCH DAMAGE.
*****************************************************************************/ *****************************************************************************/
#ifndef IPMI_DELLOEM_H
#define IPMI_DELLOEM_H #pragma once
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -366,5 +366,3 @@ typedef struct _SensorReadingType
}SensorReadingType; }SensorReadingType;
uint16_t compareinputwattage(IPMI_POWER_SUPPLY_INFO* powersupplyinfo, uint16_t inputwattage); uint16_t compareinputwattage(IPMI_POWER_SUPPLY_INFO* powersupplyinfo, uint16_t inputwattage);
int ipmi_delloem_main(struct ipmi_intf * intf, int argc, char ** argv); int ipmi_delloem_main(struct ipmi_intf * intf, int argc, char ** argv);
#endif /*IPMI_DELLOEM_H*/

View File

@ -33,8 +33,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_EKANALYZER_H #pragma once
#define IPMI_EKANALYZER_H
#include <inttypes.h> #include <inttypes.h>
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -64,5 +63,3 @@
#define FRU_RADIAL_IPMB0_LINK_MAPPING 0x15 #define FRU_RADIAL_IPMB0_LINK_MAPPING 0x15
int ipmi_ekanalyzer_main(struct ipmi_intf *, int, char **); int ipmi_ekanalyzer_main(struct ipmi_intf *, int, char **);
#endif /* IPMI_EKANALYZER_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_ENTITY_H #pragma once
#define IPMI_ENTITY_H
#ifdef HAVE_PRAGMA_PACK #ifdef HAVE_PRAGMA_PACK
#pragma pack(1) #pragma pack(1)
@ -49,5 +48,3 @@ struct entity_id {
#ifdef HAVE_PRAGMA_PACK #ifdef HAVE_PRAGMA_PACK
#pragma pack(0) #pragma pack(0)
#endif #endif
#endif /* IPMI_ENTITY_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_EVENT_H #pragma once
#define IPMI_EVENT_H
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -89,5 +88,3 @@ typedef enum {
#define EVENT_GENERATOR(base, index) (EVENT_SWID(base,index) << 1 | 1) #define EVENT_GENERATOR(base, index) (EVENT_SWID(base,index) << 1 | 1)
int ipmi_event_main(struct ipmi_intf *, int, char **); int ipmi_event_main(struct ipmi_intf *, int, char **);
#endif /*IPMI_EVENT_H*/

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_FIREWALL_H #pragma once
#define IPMI_FIREWALL_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -102,5 +101,3 @@ static inline int bit_test(const unsigned char * bf, int n) {
static inline void bit_set(unsigned char * bf, int n, int v) { static inline void bit_set(unsigned char * bf, int n, int v) {
bf[n>>3] = (bf[n>>3] & ~(1<<(n%8))) | ((v?1:0)<<(n%8)); bf[n>>3] = (bf[n>>3] & ~(1<<(n%8))) | ((v?1:0)<<(n%8));
} }
#endif /*IPMI_FIREWALL_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_FRU_H #pragma once
#define IPMI_FRU_H
#include <inttypes.h> #include <inttypes.h>
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -623,5 +622,3 @@ typedef struct ipmi_fru_bloc {
int ipmi_fru_main(struct ipmi_intf *intf, int argc, char **argv); int ipmi_fru_main(struct ipmi_intf *intf, int argc, char **argv);
int ipmi_fru_print(struct ipmi_intf *intf, struct sdr_record_fru_locator *fru); int ipmi_fru_print(struct ipmi_intf *intf, struct sdr_record_fru_locator *fru);
char *get_fru_area_str(uint8_t *data, uint32_t *offset); char *get_fru_area_str(uint8_t *data, uint32_t *offset);
#endif /* IPMI_FRU_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_KFWUM_H #pragma once
# define IPMI_KFWUM_H
#include <inttypes.h> #include <inttypes.h>
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -239,5 +238,3 @@ struct KfwumFinishFirmwareDownloadReq {
# ifdef HAVE_PRAGMA_PACK # ifdef HAVE_PRAGMA_PACK
# pragma pack(0) # pragma pack(0)
# endif # endif
#endif /* IPMI_KFWUM_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_GENDEV_H #pragma once
#define IPMI_GENDEV_H
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -44,5 +43,3 @@
#include <ipmitool/ipmi_entity.h> #include <ipmitool/ipmi_entity.h>
int ipmi_gendev_main(struct ipmi_intf *, int, char **); int ipmi_gendev_main(struct ipmi_intf *, int, char **);
#endif /* IPMI_GENDEV_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_HPMFWUPG_H #pragma once
#define IPMI_HPMFWUPG_H
#include <inttypes.h> #include <inttypes.h>
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -786,5 +785,3 @@ typedef struct _VERSIONINFO {
#define TARGET_VER (0x01) #define TARGET_VER (0x01)
#define ROLLBACK_VER (0x02) #define ROLLBACK_VER (0x02)
#define IMAGE_VER (0x04) #define IMAGE_VER (0x04)
#endif /* IPMI_KFWUM_H */

View File

@ -33,13 +33,10 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_IME_H #pragma once
#define IPMI_IME_H
#include <inttypes.h> #include <inttypes.h>
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
int ipmi_ime_main(struct ipmi_intf *, int, char **); int ipmi_ime_main(struct ipmi_intf *, int, char **);
#endif /* IPMI_IME_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_INTF_H #pragma once
#define IPMI_INTF_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
#include <ipmitool/ipmi_oem.h> #include <ipmitool/ipmi_oem.h>
@ -268,4 +267,3 @@ void ipmi_cleanup(struct ipmi_intf * intf);
#if defined(IPMI_INTF_LAN) || defined (IPMI_INTF_LANPLUS) #if defined(IPMI_INTF_LAN) || defined (IPMI_INTF_LANPLUS)
int ipmi_intf_socket_connect(struct ipmi_intf * intf); int ipmi_intf_socket_connect(struct ipmi_intf * intf);
#endif #endif
#endif /* IPMI_INTF_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_ISOL_H #pragma once
#define IPMI_ISOL_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -53,5 +52,3 @@ struct isol_config_parameters {
}; };
int ipmi_isol_main(struct ipmi_intf *, int, char **); int ipmi_isol_main(struct ipmi_intf *, int, char **);
#endif /* IPMI_SOL_H */

View File

@ -33,8 +33,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_KONTRONOEM_H #pragma once
#define IPMI_KONTRONOEM_H
#include <inttypes.h> #include <inttypes.h>
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -42,5 +41,3 @@
int ipmi_kontronoem_main(struct ipmi_intf *, int, char **); int ipmi_kontronoem_main(struct ipmi_intf *, int, char **);
int ipmi_kontronoem_set_large_buffer(struct ipmi_intf *, unsigned char size); int ipmi_kontronoem_set_large_buffer(struct ipmi_intf *, unsigned char size);
#endif /* IPMI_KONTRONOEM_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_LANP_H #pragma once
#define IPMI_LANP_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -128,5 +127,3 @@ enum {
int ipmi_lanp_main(struct ipmi_intf *, int, char **); int ipmi_lanp_main(struct ipmi_intf *, int, char **);
uint8_t find_lan_channel(struct ipmi_intf *intf, uint8_t start); uint8_t find_lan_channel(struct ipmi_intf *intf, uint8_t start);
#endif /*IPMI_LANP_H*/

View File

@ -29,8 +29,8 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef IPMI_LANP6_H
#define IPMI_LANP6_H #pragma once
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>
@ -50,5 +50,3 @@ struct ipmi_lanp_priv {
struct ipmi_intf *intf; struct ipmi_intf *intf;
int channel; int channel;
}; };
#endif /* IPMI_LANP6_H */

View File

@ -30,13 +30,10 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_MAIN_H #pragma once
#define IPMI_MAIN_H
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>
int ipmi_main(int argc, char ** argv, struct ipmi_cmd * cmdlist, struct ipmi_intf_support * intflist); int ipmi_main(int argc, char ** argv, struct ipmi_cmd * cmdlist, struct ipmi_intf_support * intflist);
void ipmi_cmd_print(struct ipmi_cmd * cmdlist); void ipmi_cmd_print(struct ipmi_cmd * cmdlist);
int ipmi_cmd_run(struct ipmi_intf * intf, char * name, int argc, char ** argv); int ipmi_cmd_run(struct ipmi_intf * intf, char * name, int argc, char ** argv);
#endif /* IPMI_MAIN_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_MC_H #pragma once
#define IPMI_MC_H
#include <stdbool.h> #include <stdbool.h>
@ -325,5 +324,3 @@ struct ipm_get_watchdog_rsp {
int ipmi_mc_getsysinfo(struct ipmi_intf * intf, int param, int block, int set, int ipmi_mc_getsysinfo(struct ipmi_intf * intf, int param, int block, int set,
int len, void *buffer); int len, void *buffer);
int ipmi_mc_setsysinfo(struct ipmi_intf * intf, int len, void *buffer); int ipmi_mc_setsysinfo(struct ipmi_intf * intf, int len, void *buffer);
#endif /*IPMI_MC_H */

View File

@ -28,8 +28,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_OEM_H #pragma once
#define IPMI_OEM_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -43,5 +42,3 @@ struct ipmi_oem_handle {
void ipmi_oem_print(void); void ipmi_oem_print(void);
int ipmi_oem_setup(struct ipmi_intf * intf, char * oemtype); int ipmi_oem_setup(struct ipmi_intf * intf, char * oemtype);
int ipmi_oem_active(struct ipmi_intf * intf, const char * oemtype); int ipmi_oem_active(struct ipmi_intf * intf, const char * oemtype);
#endif /*IPMI_OEM_H*/

View File

@ -30,8 +30,7 @@
* EVEN IF DELL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF DELL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_PEF_H #pragma once
#define IPMI_PEF_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -667,5 +666,3 @@ void ipmi_pef_print_2xd(const char * text, uint8_t u1, uint8_t u2);
void ipmi_pef_print_str(const char * text, const char * val); void ipmi_pef_print_str(const char * text, const char * val);
int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv); int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv);
#endif /* IPMI_PEF_H */

View File

@ -3,8 +3,7 @@
(C) Kontron (C) Kontron
*/ */
#ifndef _IPMI_PICMG_H_ #pragma once
#define _IPMI_PICMG_H_
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -120,5 +119,3 @@ struct sAmcPortState {
int ipmi_picmg_main (struct ipmi_intf * intf, int argc, char ** argv); int ipmi_picmg_main (struct ipmi_intf * intf, int argc, char ** argv);
uint8_t picmg_discover(struct ipmi_intf *intf); uint8_t picmg_discover(struct ipmi_intf *intf);
uint8_t ipmi_picmg_ipmb_address(struct ipmi_intf *intf); uint8_t ipmi_picmg_ipmb_address(struct ipmi_intf *intf);
#endif

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_QUANTAOEM_H #pragma once
#define IPMI_QUANTAOEM_H
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -51,5 +50,3 @@ typedef enum
qct_platform_t oem_qct_get_platform_id(struct ipmi_intf *intf); qct_platform_t oem_qct_get_platform_id(struct ipmi_intf *intf);
char *oem_qct_get_evt_desc(struct ipmi_intf *intf, struct sel_event_record *rec); char *oem_qct_get_evt_desc(struct ipmi_intf *intf, struct sel_event_record *rec);
#endif /*IPMI_QUANTAOEM_H*/

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_RAW_H #pragma once
#define IPMI_RAW_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -40,5 +39,3 @@ struct ipmi_rs * ipmi_master_write_read(struct ipmi_intf * intf, uint8_t bus, ui
uint8_t * wdata, uint8_t wsize, uint8_t rsize); uint8_t * wdata, uint8_t wsize, uint8_t rsize);
int ipmi_rawi2c_main(struct ipmi_intf * intf, int argc, char ** argv); int ipmi_rawi2c_main(struct ipmi_intf * intf, int argc, char ** argv);
int ipmi_rawspd_main(struct ipmi_intf * intf, int argc, char ** argv); int ipmi_rawspd_main(struct ipmi_intf * intf, int argc, char ** argv);
#endif /* IPMI_RAW_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_SDR_H #pragma once
#define IPMI_SDR_H
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -926,5 +925,3 @@ int ipmi_sdr_print_sensor_event_enable(struct ipmi_intf *intf,
uint8_t sensor_num, uint8_t sensor_type, uint8_t sensor_num, uint8_t sensor_type,
uint8_t event_type, int numeric_fmt, uint8_t event_type, int numeric_fmt,
uint8_t target, uint8_t lun, uint8_t channel); uint8_t target, uint8_t lun, uint8_t channel);
#endif /* IPMI_SDR_H */

View File

@ -28,8 +28,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_SDRADD_H #pragma once
#define IPMI_SDRADD_H
/* /*
* Methods to add SDRs to repository from built-in sensors or files * Methods to add SDRs to repository from built-in sensors or files
@ -42,5 +41,3 @@ ipmi_sdr_add_from_file(struct ipmi_intf *intf, const char *ifile);
int int
ipmi_sdr_add_from_list(struct ipmi_intf *intf, const char *rangeList); ipmi_sdr_add_from_list(struct ipmi_intf *intf, const char *rangeList);
#endif /* IPMI_SDRADD_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_SEL_H #pragma once
#define IPMI_SEL_H
#include <inttypes.h> #include <inttypes.h>
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -687,5 +686,3 @@ const struct ipmi_event_sensor_types *
ipmi_get_first_event_sensor_type(struct ipmi_intf *intf, uint8_t sensor_type, uint8_t event_type); ipmi_get_first_event_sensor_type(struct ipmi_intf *intf, uint8_t sensor_type, uint8_t event_type);
const struct ipmi_event_sensor_types * const struct ipmi_event_sensor_types *
ipmi_get_next_event_sensor_type(const struct ipmi_event_sensor_types *evt); ipmi_get_next_event_sensor_type(const struct ipmi_event_sensor_types *evt);
#endif /* IPMI_SEL_H */

View File

@ -30,9 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#pragma once
#ifndef IPMI_SEL_SUPERMICRO_H
# define IPMI_SEL_SUPERMICRO_H
static uint16_t supermicro_x11[] = { static uint16_t supermicro_x11[] = {
0x0958, 0x0955, 0x0953, 0x0952, 0x0941, 0x093A, 0x0939, 0x0938, 0x0937, 0x0930, 0x0927, 0x091D, 0x0958, 0x0955, 0x0953, 0x0952, 0x0941, 0x093A, 0x0939, 0x0938, 0x0937, 0x0930, 0x0927, 0x091D,
@ -151,5 +149,3 @@ static uint16_t supermicro_older[] = {
0x0944, 0x0945, 0x0947, 0x0948, 0x0949, 0x094A, 0x094B, 0x094C, 0x094D, 0x094E, 0x0954, 0x0956, 0x0944, 0x0945, 0x0947, 0x0948, 0x0949, 0x094A, 0x094B, 0x094C, 0x094D, 0x094E, 0x0954, 0x0956,
0x0957, 0x0959, 0xFFFF 0x0957, 0x0959, 0xFFFF
}; };
#endif /* IPMI_SEL_SUPERMICRO_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_SENSOR_H #pragma once
#define IPMI_SENSOR_H
#include <math.h> #include <math.h>
#include <ipmitool/bswap.h> #include <ipmitool/bswap.h>
@ -86,4 +85,3 @@ struct sensor_set_thresh_rq {
int ipmi_sensor_main(struct ipmi_intf *, int, char **); int ipmi_sensor_main(struct ipmi_intf *, int, char **);
int ipmi_sensor_print_fc(struct ipmi_intf *, struct sdr_record_common_sensor *, uint8_t); int ipmi_sensor_print_fc(struct ipmi_intf *, struct sdr_record_common_sensor *, uint8_t);
int ipmi_sensor_get_sensor_reading_factors( struct ipmi_intf * intf, struct sdr_record_full_sensor * sensor, uint8_t reading); int ipmi_sensor_get_sensor_reading_factors( struct ipmi_intf * intf, struct sdr_record_full_sensor * sensor, uint8_t reading);
#endif /* IPMI_SENSOR_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_SESSION_H #pragma once
#define IPMI_SESSION_H
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -127,5 +126,3 @@ struct get_session_info_rsp
int ipmi_session_main(struct ipmi_intf *, int, char **); int ipmi_session_main(struct ipmi_intf *, int, char **);
#endif /*IPMI_CHANNEL_H*/

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_SOL_H #pragma once
#define IPMI_SOL_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -102,6 +101,3 @@ int ipmi_sol_main(struct ipmi_intf *, int, char **);
int ipmi_get_sol_info(struct ipmi_intf *intf, int ipmi_get_sol_info(struct ipmi_intf *intf,
uint8_t channel, uint8_t channel,
struct sol_config_parameters *params); struct sol_config_parameters *params);
#endif /* IPMI_SOL_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_STRINGS_H #pragma once
#define IPMI_STRINGS_H
#include <ipmitool/helper.h> #include <ipmitool/helper.h>
@ -75,5 +74,3 @@ extern const struct oemvalstr picmg_busres_shmc_status_vals[];
extern const struct oemvalstr ipmi_oem_product_info[]; extern const struct oemvalstr ipmi_oem_product_info[];
extern const char *ipmi_generic_sensor_type_vals[]; extern const char *ipmi_generic_sensor_type_vals[];
extern const struct oemvalstr ipmi_oem_sensor_type_vals[]; extern const struct oemvalstr ipmi_oem_sensor_type_vals[];
#endif /*IPMI_STRINGS_H*/

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_SUNOEM_H #pragma once
#define IPMI_SUNOEM_H
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -68,6 +67,3 @@ typedef enum {
} sunoem_ec_t; } sunoem_ec_t;
int ipmi_sunoem_main(struct ipmi_intf *, int, char **); int ipmi_sunoem_main(struct ipmi_intf *, int, char **);
#endif /*IPMI_SUNOEM_H*/

View File

@ -30,8 +30,8 @@
* SOFTWARE, EVEN IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY * SOFTWARE, EVEN IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGES. * OF SUCH DAMAGES.
*/ */
#ifndef IPMI_TIME_H
#define IPMI_TIME_H #pragma once
#include <time.h> #include <time.h>
#include <stdbool.h> #include <stdbool.h>
@ -88,6 +88,3 @@ char *ipmi_timestamp_time(uint32_t stamp); /* HH:MM:SS ZZZ */
/* Subtract the UTC offset from local time_t */ /* Subtract the UTC offset from local time_t */
time_t ipmi_localtime2utc(time_t local); time_t ipmi_localtime2utc(time_t local);
#endif

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_TSOL_H #pragma once
#define IPMI_TSOL_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -42,5 +41,3 @@
#define IPMI_TSOL_DEF_PORT 6230 #define IPMI_TSOL_DEF_PORT 6230
int ipmi_tsol_main(struct ipmi_intf *, int, char **); int ipmi_tsol_main(struct ipmi_intf *, int, char **);
#endif /* IPMI_TSOL_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_USER_H #pragma once
#define IPMI_USER_H
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -82,5 +81,3 @@ int _ipmi_set_user_access(struct ipmi_intf *intf,
int _ipmi_set_user_password(struct ipmi_intf *intf, int _ipmi_set_user_password(struct ipmi_intf *intf,
uint8_t user_id, uint8_t operation, uint8_t user_id, uint8_t operation,
const char *password, uint8_t is_twenty_byte); const char *password, uint8_t is_twenty_byte);
#endif /* IPMI_USER_H */

View File

@ -2,8 +2,7 @@
* Copyright (c) Pigeon Point Systems. All right reserved * Copyright (c) Pigeon Point Systems. All right reserved
*/ */
#ifndef _IPMI_VITA_H_ #pragma once
#define _IPMI_VITA_H_
/* VITA 46.11 commands */ /* VITA 46.11 commands */
#define VITA_GET_VSO_CAPABILITIES_CMD 0x00 #define VITA_GET_VSO_CAPABILITIES_CMD 0x00
@ -45,5 +44,3 @@ ipmi_vita_ipmb_address(struct ipmi_intf *intf);
extern int extern int
ipmi_vita_main(struct ipmi_intf * intf, int argc, char ** argv); ipmi_vita_main(struct ipmi_intf * intf, int argc, char ** argv);
#endif /* _IPMI_VITA_H_ */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMITOOL_LOG_H #pragma once
#define IPMITOOL_LOG_H
#include <syslog.h> #include <syslog.h>
@ -57,6 +56,3 @@ void log_halt(void);
void log_level_set(int verbose); void log_level_set(int verbose);
void lprintf(int level, const char * format, ...); void lprintf(int level, const char * format, ...);
void lperror(int level, const char * format, ...); void lperror(int level, const char * format, ...);
#endif /*IPMITOOL_LOG_H*/

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef _IPMI_BMC_H_ #pragma once
#define _IPMI_BMC_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -48,5 +47,3 @@ void ipmi_bmc_close(struct ipmi_intf *intf);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _IPMI_BMC_H_ */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef _BMC_INTF_H #pragma once
#define _BMC_INTF_H
#pragma ident "@(#)bmc_intf.h 1.2 05/03/07 SMI" #pragma ident "@(#)bmc_intf.h 1.2 05/03/07 SMI"
@ -203,5 +202,3 @@ typedef struct bmc_msg {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _BMC_INTF_H */

View File

@ -1,5 +1,4 @@
#ifndef IPMI_DUMMYIPMI_H #pragma once
# define IPMI_DUMMYIPMI_H
#define IPMI_DUMMY_DEFAULTSOCK "/tmp/.ipmi_dummy" #define IPMI_DUMMY_DEFAULTSOCK "/tmp/.ipmi_dummy"
@ -26,5 +25,3 @@ struct dummy_rs {
int data_len; int data_len;
uint8_t *data; uint8_t *data;
}; };
#endif

View File

@ -33,6 +33,9 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*----------------------------------------------------------------------*/ *----------------------------------------------------------------------*/
#pragma once
#ifndef _WINDEFS_H #ifndef _WINDEFS_H
#define _WINDEFS_H #define _WINDEFS_H

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_ASF_H #pragma once
#define IPMI_ASF_H
#include <ipmitool/helper.h> #include <ipmitool/helper.h>
#include "lan.h" #include "lan.h"
@ -57,5 +56,3 @@ struct asf_hdr {
#endif #endif
int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len); int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len);
#endif /* IPMI_ASF_H */

View File

@ -30,11 +30,8 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_AUTH_H #pragma once
#define IPMI_AUTH_H
uint8_t * ipmi_auth_md2(struct ipmi_session * s, uint8_t * data, int data_len); uint8_t * ipmi_auth_md2(struct ipmi_session * s, uint8_t * data, int data_len);
uint8_t * ipmi_auth_md5(struct ipmi_session * s, uint8_t * data, int data_len); uint8_t * ipmi_auth_md5(struct ipmi_session * s, uint8_t * data, int data_len);
uint8_t * ipmi_auth_special(struct ipmi_session * s); uint8_t * ipmi_auth_special(struct ipmi_session * s);
#endif /*IPMI_AUTH_H*/

View File

@ -30,12 +30,9 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_LAN_H #pragma once
#define IPMI_LAN_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>
extern struct ipmi_intf ipmi_lan_intf; extern struct ipmi_intf ipmi_lan_intf;
#endif /*IPMI_LAN_H*/

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_RMCP_H #pragma once
#define IPMI_RMCP_H
#include <ipmitool/helper.h> #include <ipmitool/helper.h>
#include "lan.h" #include "lan.h"
@ -82,5 +81,3 @@ struct rmcp_pong {
#endif #endif
int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len); int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len);
#endif /* IPMI_RMCP_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_ASF_H #pragma once
#define IPMI_ASF_H
#include <ipmitool/helper.h> #include <ipmitool/helper.h>
#include "lanplus.h" #include "lanplus.h"
@ -57,5 +56,3 @@ struct asf_hdr {
#endif #endif
int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len); int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len);
#endif /* IPMI_ASF_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_LANPLUS_H #pragma once
#define IPMI_LANPLUS_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
@ -130,5 +129,3 @@ struct ipmi_rs * ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req
int ipmi_lanplus_open(struct ipmi_intf * intf); int ipmi_lanplus_open(struct ipmi_intf * intf);
void ipmi_lanplus_close(struct ipmi_intf * intf); void ipmi_lanplus_close(struct ipmi_intf * intf);
int ipmiv2_lan_ping(struct ipmi_intf * intf); int ipmiv2_lan_ping(struct ipmi_intf * intf);
#endif /*IPMI_LAN_H*/

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_LANPLUS_CRYPT_H #pragma once
#define IPMI_LANPLUS_CRYPT_H
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>
@ -68,8 +67,3 @@ int lanplus_decrypt_payload(uint8_t crypt_alg,
uint16_t * payload_size); uint16_t * payload_size);
int lanplus_has_valid_auth_code(struct ipmi_rs * rs, int lanplus_has_valid_auth_code(struct ipmi_rs * rs,
struct ipmi_session * session); struct ipmi_session * session);
#endif /* IPMI_LANPLUS_CRYPT_H */

View File

@ -30,9 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_LANPLUS_CRYPT_IMPL_H #pragma once
#define IPMI_LANPLUS_CRYPT_IMPL_H
int int
lanplus_seed_prng(uint32_t bytes); lanplus_seed_prng(uint32_t bytes);
@ -61,6 +59,3 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
uint32_t input_length, uint32_t input_length,
uint8_t * output, uint8_t * output,
uint32_t * bytes_written); uint32_t * bytes_written);
#endif /* IPMI_LANPLUS_CRYPT_IMPL_H */

View File

@ -30,9 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#pragma once
#ifndef IPMI_LANPLUS_DUMP_H
#define IPMI_LANPLUS_DUMP_H
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>
@ -40,6 +38,3 @@
void lanplus_dump_open_session_response(const struct ipmi_rs * rsp); void lanplus_dump_open_session_response(const struct ipmi_rs * rsp);
void lanplus_dump_rakp2_message(const struct ipmi_rs * rsp, uint8_t auth_alg); void lanplus_dump_rakp2_message(const struct ipmi_rs * rsp, uint8_t auth_alg);
void lanplus_dump_rakp4_message(const struct ipmi_rs * rsp, uint8_t auth_alg); void lanplus_dump_rakp4_message(const struct ipmi_rs * rsp, uint8_t auth_alg);
#endif /* IPMI_LANPLUS_DUMP_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_RMCP_H #pragma once
#define IPMI_RMCP_H
#include <ipmitool/helper.h> #include <ipmitool/helper.h>
#include "lanplus.h" #include "lanplus.h"
@ -65,5 +64,3 @@ struct rmcp_hdr {
#endif #endif
int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len); int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len);
#endif /* IPMI_RMCP_H */

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_LIPMI_H #pragma once
#define IPMI_LIPMI_H
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>
@ -42,5 +41,3 @@ struct ipmi_rs * ipmi_lipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * r
int ipmi_lipmi_open(struct ipmi_intf * intf); int ipmi_lipmi_open(struct ipmi_intf * intf);
void ipmi_lipmi_close(struct ipmi_intf * intf); void ipmi_lipmi_close(struct ipmi_intf * intf);
int lipmi_intf_setup(struct ipmi_intf ** intf); int lipmi_intf_setup(struct ipmi_intf ** intf);
#endif

View File

@ -30,8 +30,7 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#ifndef IPMI_OPENIPMI_H #pragma once
#define IPMI_OPENIPMI_H
#define IPMI_MAX_ADDR_SIZE 0x20 #define IPMI_MAX_ADDR_SIZE 0x20
#define IPMI_BMC_CHANNEL 0xf #define IPMI_BMC_CHANNEL 0xf
@ -102,5 +101,3 @@ struct ipmi_ipmb_addr {
#define IPMICTL_GET_MY_ADDRESS_CMD _IOR(IPMI_IOC_MAGIC, 18, unsigned int) #define IPMICTL_GET_MY_ADDRESS_CMD _IOR(IPMI_IOC_MAGIC, 18, unsigned int)
#define IPMICTL_SET_MY_LUN_CMD _IOR(IPMI_IOC_MAGIC, 19, unsigned int) #define IPMICTL_SET_MY_LUN_CMD _IOR(IPMI_IOC_MAGIC, 19, unsigned int)
#define IPMICTL_GET_MY_LUN_CMD _IOR(IPMI_IOC_MAGIC, 20, unsigned int) #define IPMICTL_GET_MY_LUN_CMD _IOR(IPMI_IOC_MAGIC, 20, unsigned int)
#endif /*IPMI_OPENIPMI_H*/