AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-19 04:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix not connecting to multiplayer severs on freebsd

Browse Source
This commit is contained in:
UnknownShadow200 2019-01-24 22:37:36 +11:00
parent 0b935fec20
commit d673a51108
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/LWeb.c
View File

@ -517,6 +517,10 @@ void FetchUpdateTask_Run(bool release, bool d3d9) {
#elif defined CC_BUILD_OSX #elif defined CC_BUILD_OSX
const char* exe_d3d9 = "ClassiCube.osx"; const char* exe_d3d9 = "ClassiCube.osx";
const char* exe_ogl = "ClassiCube.osx"; const char* exe_ogl = "ClassiCube.osx";
#else
#warn "Unsupported platform, launcher updating will not work"
const char* exe_d3d9 = "ClassiCube.unknown";
const char* exe_ogl = "ClassiCube.unknown";
#endif #endif
const static String id = String_FromConst("CC update fetch"); const static String id = String_FromConst("CC update fetch");

18
src/Logger.c
View File

@ -393,16 +393,16 @@ static void Logger_DumpRegisters(void* ctx) {
#if defined CC_BUILD_BSD #if defined CC_BUILD_BSD
#if defined __i386__ #if defined __i386__
String_Format3(&str, "eax=%x ebx=%x ecx=%x\n", &r.mc__eax, &r.mc__ebx, &r.mc__ecx); String_Format3(&str, "eax=%x ebx=%x ecx=%x\n", &r.mc_eax, &r.mc_ebx, &r.mc_ecx);
String_Format3(&str, "edx=%x esi=%x edi=%x\n", &r.mc__edx, &r.mc__esi, &r.mc__edi); String_Format3(&str, "edx=%x esi=%x edi=%x\n", &r.mc_edx, &r.mc_esi, &r.mc_edi);
String_Format3(&str, "eip=%x ebp=%x esp=%x\n", &r.mc__eip, &r.mc__ebp, &r.mc__esp); String_Format3(&str, "eip=%x ebp=%x esp=%x\n", &r.mc_eip, &r.mc_ebp, &r.mc_esp);
#elif defined __x86_64__ #elif defined __x86_64__
String_Format3(&str, "rax=%x rbx=%x rcx=%x\n", &r.mc__rax, &r.mc__rbx, &r.mc__rcx); String_Format3(&str, "rax=%x rbx=%x rcx=%x\n", &r.mc_rax, &r.mc_rbx, &r.mc_rcx);
String_Format3(&str, "rdx=%x rsi=%x rdi=%x\n", &r.mc__rdx, &r.mc__rsi, &r.mc__rdi); String_Format3(&str, "rdx=%x rsi=%x rdi=%x\n", &r.mc_rdx, &r.mc_rsi, &r.mc_rdi);
String_Format3(&str, "rip=%x rbp=%x rsp=%x\n", &r.mc__rip, &r.mc__rbp, &r.mc__rsp); String_Format3(&str, "rip=%x rbp=%x rsp=%x\n", &r.mc_rip, &r.mc_rbp, &r.mc_rsp);
String_Format3(&str, "r8 =%x r9 =%x r10=%x\n", &r.mc__r8, &r.mc__r9, &r.mc__r10); String_Format3(&str, "r8 =%x r9 =%x r10=%x\n", &r.mc_r8, &r.mc_r9, &r.mc_r10);
String_Format3(&str, "r11=%x r12=%x r13=%x\n", &r.mc__r11, &r.mc__r12, &r.mc__r13); String_Format3(&str, "r11=%x r12=%x r13=%x\n", &r.mc_r11, &r.mc_r12, &r.mc_r13);
String_Format2(&str, "r14=%x r15=%x\n", &r.mc__r14, &r.mc__r15); String_Format2(&str, "r14=%x r15=%x\n", &r.mc_r14, &r.mc_r15);
#else #else
#error "Unknown machine type" #error "Unknown machine type"
#endif #endif

12
src/Platform.c
View File

@ -788,7 +788,7 @@ void Mutex_Unlock(void* handle) {
} }
struct WaitData { struct WaitData {
pthread_cont_t cond; pthread_cond_t cond;
pthread_mutex_t mutex; pthread_mutex_t mutex;
}; };
@ -1333,14 +1333,14 @@ ReturnCode Socket_GetError(SocketHandle socket, ReturnCode* result) {
} }
ReturnCode Socket_Connect(SocketHandle socket, const String* ip, int port) { ReturnCode Socket_Connect(SocketHandle socket, const String* ip, int port) {
struct { int16_t Family; uint8_t Port[2], IP[4], Pad[8]; } addr; struct sockaddr addr;
ReturnCode res; ReturnCode res;
addr.Family = AF_INET; addr.sa_family = AF_INET;
Stream_SetU16_BE(addr.Port, port); Stream_SetU16_BE(&addr.sa_data[0], port);
Utils_ParseIP(ip, addr.IP); Utils_ParseIP(ip, &addr.sa_data[2]);
res = connect(socket, (struct sockaddr*)(&addr), sizeof(addr)); res = connect(socket, &addr, sizeof(addr));
return res == -1 ? Socket__Error() : 0; return res == -1 ? Socket__Error() : 0;
} }