tijiao

app/goahead-5.1.0/build/linux-arm-static/inc/ResultUtils.h

@@ -15,4 +15,5 @@ void successResult(Webs *wp);
 //成功切无数据返回
 void errorResult(Webs *wp);
 
+
 #endif /* __RESULT_UTILS_H__ */

app/goahead-5.1.0/projects/goahead-linux-static.mk

@@ -236,7 +236,6 @@ DEPS_USER_H2 += src/libipmi/inc/libipmi_IPM.h
 DEPS_USER_H2 += ../common_include/com_IPMI_AppDevice.h
 DEPS_USER_H2 += ../common_include/com_IPMIDefs.h
 DEPS_USER_H2 += ../common_include/com_IPMI_IPM.h
-DEPS_USER_H2 += ../common_include/com_UDSIfc.h
 DEPS_USER_H2 += ../common_include/com_IPMI_App.h
 
 $(BUILD)/inc/libipmi_session.h: $(DEPS_USER_H2)
@@ -272,10 +271,6 @@ $(BUILD)/inc/com_IPMI_IPM.h: $(DEPS_USER_H2)
 	@echo '      [Copy] $(BUILD)/inc/com_IPMI_IPM.h'
 	mkdir -p "$(BUILD)/inc"
 	cp ../common_include/com_IPMI_IPM.h $(BUILD)/inc/com_IPMI_IPM.h
-$(BUILD)/inc/com_UDSIfc.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/com_UDSIfc.h'
-	mkdir -p "$(BUILD)/inc"
-	cp ../common_include/com_UDSIfc.h $(BUILD)/inc/com_UDSIfc.h
 $(BUILD)/inc/com_IPMI_App.h: $(DEPS_USER_H2)
 	@echo '      [Copy] $(BUILD)/inc/com_IPMI_App.h'
 	mkdir -p "$(BUILD)/inc"
@@ -289,7 +284,6 @@ DEPS_USER_C2 += $(BUILD)/inc/libipmi_IPM.h
 DEPS_USER_C2 += $(BUILD)/inc/com_IPMI_AppDevice.h
 DEPS_USER_C2 += $(BUILD)/inc/com_IPMIDefs.h
 DEPS_USER_C2 += $(BUILD)/inc/com_IPMI_IPM.h
-DEPS_USER_C2 += $(BUILD)/inc/com_UDSIfc.h
 DEPS_USER_C2 += $(BUILD)/inc/com_IPMI_App.h
 
 $(BUILD)/obj/libipmi_session.o: \
@@ -618,109 +612,6 @@ $(BUILD)/bin/libgoahead-openssl.a: $(DEPS_35)
 	@echo '      [Link] $(BUILD)/bin/libgoahead-openssl.a'
 	$(AR) -cr $(BUILD)/bin/libgoahead-openssl.a "$(BUILD)/obj/goahead-openssl.o"
 endif
-<<<<<<< HEAD
-=======
-#################### jimbo modify ###########################
-#
-#   cJSON
-#
-DEPS_USER_H1 += src/cJSON/cJSON.h
-DEPS_USER_H1 += $(BUILD)/inc/goahead.h
-
-$(BUILD)/inc/cJSON.h: $(DEPS_USER_H1)
-	@echo '      [Copy] $(BUILD)/inc/cJSON.h'
-	mkdir -p "$(BUILD)/inc"
-	cp src/cJSON/cJSON.h $(BUILD)/inc/cJSON.h
-
-DEPS_USER_C1 += $(BUILD)/inc/goahead.h
-DEPS_USER_C1 += $(BUILD)/inc/cJSON.h
-
-$(BUILD)/obj/cJSON.o: \
-    src/cJSON/cJSON.c $(DEPS_USER_C1)
-	@echo '   [Compile] $(BUILD)/obj/cJSON.o'
-	$(CC) -c -o $(BUILD)/obj/cJSON.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" -DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) "-I$(ME_COM_OPENSSL_PATH)/include" src/cJSON/cJSON.c
-
-#
-#	libipmi
-#
-DEPS_USER_H2 += src/libipmi/inc/libipmi_session.h
-DEPS_USER_H2 += src/libipmi/inc/libipmi.h
-DEPS_USER_H2 += src/libipmi/inc/libipmi_errorcodes.h
-DEPS_USER_H2 += src/libipmi/inc/libipmi_struct.h
-DEPS_USER_H2 += src/libipmi/inc/libipmi_IPM.h
-DEPS_USER_H2 += ../common_include/com_IPMI_AppDevice.h
-DEPS_USER_H2 += ../common_include/com_IPMIDefs.h
-DEPS_USER_H2 += ../common_include/com_IPMI_IPM.h
-DEPS_USER_H2 += ../common_include/com_IPMI_App.h
-DEPS_USER_H2 += ../common_include/com_Message.h
-
-
-$(BUILD)/inc/libipmi_session.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/libipmi_session.h'
-	mkdir -p "$(BUILD)/inc"
-	cp src/libipmi/inc/libipmi_session.h $(BUILD)/inc/libipmi_session.h
-$(BUILD)/inc/libipmi.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/libipmi.h'
-	mkdir -p "$(BUILD)/inc"
-	cp src/libipmi/inc/libipmi.h $(BUILD)/inc/libipmi.h
-$(BUILD)/inc/libipmi_errorcodes.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/libipmi_errorcodes.h'
-	mkdir -p "$(BUILD)/inc"
-	cp src/libipmi/inc/libipmi_errorcodes.h $(BUILD)/inc/libipmi_errorcodes.h
-$(BUILD)/inc/libipmi_struct.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/libipmi_struct.h'
-	mkdir -p "$(BUILD)/inc"
-	cp src/libipmi/inc/libipmi_struct.h $(BUILD)/inc/libipmi_struct.h
-$(BUILD)/inc/libipmi_IPM.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/libipmi_IPM.h'
-	mkdir -p "$(BUILD)/inc"
-	cp src/libipmi/inc/libipmi_IPM.h $(BUILD)/inc/libipmi_IPM.h
-
-$(BUILD)/inc/com_IPMI_AppDevice.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/com_IPMI_AppDevice.h'
-	mkdir -p "$(BUILD)/inc"
-	cp ../common_include/com_IPMI_AppDevice.h $(BUILD)/inc/com_IPMI_AppDevice.h
-$(BUILD)/inc/com_IPMIDefs.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/com_IPMIDefs.h'
-	mkdir -p "$(BUILD)/inc"
-	cp ../common_include/com_IPMIDefs.h $(BUILD)/inc/com_IPMIDefs.h
-$(BUILD)/inc/com_IPMI_IPM.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/com_IPMI_IPM.h'
-	mkdir -p "$(BUILD)/inc"
-	cp ../common_include/com_IPMI_IPM.h $(BUILD)/inc/com_IPMI_IPM.h
-$(BUILD)/inc/com_IPMI_App.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/com_IPMI_App.h'
-	mkdir -p "$(BUILD)/inc"
-	cp ../common_include/com_IPMI_App.h $(BUILD)/inc/com_IPMI_App.h
-$(BUILD)/inc/com_Message.h: $(DEPS_USER_H2)
-	@echo '      [Copy] $(BUILD)/inc/com_Message.h'
-	mkdir -p "$(BUILD)/inc"
-	cp ../common_include/com_Message.h $(BUILD)/inc/com_Message.h
-
-DEPS_USER_C2 += $(BUILD)/inc/libipmi_session.h
-DEPS_USER_C2 += $(BUILD)/inc/libipmi.h
-DEPS_USER_C2 += $(BUILD)/inc/libipmi_errorcodes.h
-DEPS_USER_C2 += $(BUILD)/inc/libipmi_struct.h
-DEPS_USER_C2 += $(BUILD)/inc/libipmi_IPM.h
-DEPS_USER_C2 += $(BUILD)/inc/com_IPMI_AppDevice.h
-DEPS_USER_C2 += $(BUILD)/inc/com_IPMIDefs.h
-DEPS_USER_C2 += $(BUILD)/inc/com_IPMI_IPM.h
-DEPS_USER_C2 += $(BUILD)/inc/com_IPMI_App.h
-DEPS_USER_C2 += $(BUILD)/inc/com_Message.h
-
-$(BUILD)/obj/libipmi_session.o: \
-    src/libipmi/src/libipmi_session.c $(DEPS_USER_C2)
-	@echo '   [Compile] $(BUILD)/obj/libipmi_session.o'
-	$(CC) -c -o $(BUILD)/obj/libipmi_session.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" -DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) "-I$(ME_COM_OPENSSL_PATH)/include" src/libipmi/src/libipmi_session.c
-$(BUILD)/obj/libipmi_uds_session.o: \
-    src/libipmi/src/libipmi_uds_session.c $(DEPS_USER_C2)
-	@echo '   [Compile] $(BUILD)/obj/libipmi_uds_session.o'
-	$(CC) -c -o $(BUILD)/obj/libipmi_uds_session.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" -DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) "-I$(ME_COM_OPENSSL_PATH)/include" src/libipmi/src/libipmi_uds_session.c
-
-
-
->>>>>>> e6a63ef6c6e90e8205b98f082134c6cfa84f17c0
-
 
 #
 #   libgo

app/goahead-5.1.0/src/auth.c

@@ -24,11 +24,8 @@
 /********************************* Includes ***********************************/
 
 #include    "goahead.h"
-<<<<<<< HEAD
 #include    "ResultUtils.h"
-=======
 #include    <stdio.h>
->>>>>>> e6a63ef6c6e90e8205b98f082134c6cfa84f17c0
 
 #if ME_GOAHEAD_AUTH
 
@@ -514,13 +511,10 @@ PUBLIC bool websLoginUser(Webs *wp, cchar *username, cchar *password)
     assert(wp->route);
     assert(username);
     assert(password);
-<<<<<<< HEAD
     logmsg(2, "%s-----------password auth0- ---------", password);
     logmsg(2, "%s-----------begin auth1 ---------", wp->route);
-=======
 
     printf("---> websLoginUser, username: %s, password: %s\n", username, password);
->>>>>>> e6a63ef6c6e90e8205b98f082134c6cfa84f17c0
     if (!wp->route || !wp->route->verify) {
         return 0;
     }

app/goahead-5.1.0/src/libipmi/inc/libipmi_session.h

@@ -20,7 +20,6 @@
 
 
 //#include "IPMI_RMCP.h"
-#include "com_IPMIDefs.h"
 //#include "IPMI_App.h"
 //#include "IPMI_AppDevice.h"
 //#include "IPMI_RMCP+.h"

app/goahead-5.1.0/src/libipmi/src/libipmi_session.c

@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include "com_IPMI_App.h"
 #include "com_IPMI_AppDevice.h"
+#include "com_IPMIDefs.h"
 #define MAX_RETRIES	10
 #define MAX_USERS 16
 //void *dl_salhandler = NULL;  //This handler will be used by SAL layer.

app/goahead-5.1.0/src/web/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>bmcui</title><link href=/static/css/app.css rel=preload as=style><link href=/static/js/app.js rel=preload as=script><link href=/static/js/chunk-vendors.js rel=preload as=script><link href=/static/css/app.css rel=stylesheet></head><body><noscript><strong>We're sorry but bmcui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.js></script><script src=/static/js/app.js></script></body></html>

app/goahead-5.1.0/src/web/static/css/app.css

@@ -0,0 +1 @@
+h3[data-v-b9167eee]{margin:40px 0 0}ul[data-v-b9167eee]{list-style-type:none;padding:0}li[data-v-b9167eee]{display:inline-block;margin:0 10px}a[data-v-b9167eee]{color:#42b983}#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;color:#2c3e50;margin-top:60px}