mirror of
https://github.com/BeamMP/BeamMP-Server.git
synced 2025-07-04 00:36:14 +00:00
Fixed Data size
This commit is contained in:
parent
e2cae1da59
commit
f427cb8d06
@ -3,13 +3,14 @@
|
|||||||
//
|
//
|
||||||
#include "enet.h"
|
#include "enet.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <fstream>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
void NameRequest(ENetPeer*peer){
|
void NameRequest(ENetPeer*peer){
|
||||||
ENetPacket* packet = enet_packet_create ("NameRequest", //Send A Name Request to the Client
|
ENetPacket* packet = enet_packet_create ("NameRequest", //Send A Name Request to the Client
|
||||||
strlen ("NameRequest") + 1,
|
strlen ("NameRequest") + 1,
|
||||||
ENET_PACKET_FLAG_RELIABLE); //Create A reliable packet using the data
|
ENET_PACKET_FLAG_RELIABLE); //Create A reliable packet using the data
|
||||||
enet_peer_send(peer, 0, packet);
|
enet_peer_send(peer, 0, packet);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SendToAll(ENetHost *server,ENetEvent event){
|
void SendToAll(ENetHost *server,ENetEvent event){
|
||||||
@ -19,7 +20,9 @@ void SendToAll(ENetHost *server,ENetEvent event){
|
|||||||
char Data[500];
|
char Data[500];
|
||||||
sprintf(Data,"There is %d Players Connected!",server->connectedPeers);
|
sprintf(Data,"There is %d Players Connected!",server->connectedPeers);
|
||||||
printf("test %d\n",server->peers[i].serverVehicleID);
|
printf("test %d\n",server->peers[i].serverVehicleID);
|
||||||
|
|
||||||
packet = enet_packet_create(Data, strlen(Data)+1, 0);
|
packet = enet_packet_create(Data, strlen(Data)+1, 0);
|
||||||
|
|
||||||
enet_peer_send(&server->peers[i], 0, packet);
|
enet_peer_send(&server->peers[i], 0, packet);
|
||||||
enet_host_flush(server);
|
enet_host_flush(server);
|
||||||
//}
|
//}
|
||||||
|
@ -2,13 +2,17 @@
|
|||||||
// Created by Anonymous275 on 4/2/2020.
|
// Created by Anonymous275 on 4/2/2020.
|
||||||
//
|
//
|
||||||
#include "enet.h"
|
#include "enet.h"
|
||||||
#include <stdio.h>
|
#include <iostream>
|
||||||
#include "../logger.h"
|
#include "../logger.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
char Name[20] = "";
|
char Name[20] = "";
|
||||||
void ParseData(ENetPacket*packet,ENetPeer*peer){ //here we will parse the data
|
void ParseData(ENetPacket*packet,ENetPeer*peer){ //here we will parse the data
|
||||||
enet_uint8* Data = packet->data;
|
enet_uint8* Data = packet->data;
|
||||||
if(strcmp((char*)peer->Name,"Client information")==0){ //Checks if the Client has no name
|
|
||||||
|
cout << "Data : " << packet->data << std::endl;
|
||||||
|
cout << "Size : " << strlen(reinterpret_cast<const char *>(packet->data)) << std::endl;
|
||||||
|
/*if(strcmp((char*)peer->Name,"Client information")==0){ //Checks if the Client has no name
|
||||||
sprintf(Name,"%s",Data);
|
sprintf(Name,"%s",Data);
|
||||||
peer->Name = (void *)Name;
|
peer->Name = (void *)Name;
|
||||||
char Info[100];
|
char Info[100];
|
||||||
@ -17,5 +21,5 @@ void ParseData(ENetPacket*packet,ENetPeer*peer){ //here we will parse the data
|
|||||||
peer->serverVehicleID = (int)peer->connectID; //test to see if it works
|
peer->serverVehicleID = (int)peer->connectID; //test to see if it works
|
||||||
sprintf(Info,"%s ServerVehicleID : %d GameVehicleID : %d",Name,peer->serverVehicleID,peer->gameVehicleID[0]);
|
sprintf(Info,"%s ServerVehicleID : %d GameVehicleID : %d",Name,peer->serverVehicleID,peer->gameVehicleID[0]);
|
||||||
info(Info);
|
info(Info);
|
||||||
}
|
}*/
|
||||||
}
|
}
|
@ -29,6 +29,7 @@ void host_server(ENetHost *server) {
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
case ENET_EVENT_TYPE_RECEIVE:
|
case ENET_EVENT_TYPE_RECEIVE:
|
||||||
|
|
||||||
ParseData(event.packet,event.peer/*->dataLength,event.packet->data, (char *)event.peer->data, event.channelID*/); //We grab and Parse the Data
|
ParseData(event.packet,event.peer/*->dataLength,event.packet->data, (char *)event.peer->data, event.channelID*/); //We grab and Parse the Data
|
||||||
/* Clean up the packet now that we're done using it. */
|
/* Clean up the packet now that we're done using it. */
|
||||||
enet_packet_destroy (event.packet);
|
enet_packet_destroy (event.packet);
|
||||||
|
@ -115,7 +115,7 @@ string RemoveComments(string Line){
|
|||||||
string convertToString(char* a, int size)
|
string convertToString(char* a, int size)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
string s = "";
|
string s;
|
||||||
for (i = 0; i < size; i++) {
|
for (i = 0; i < size; i++) {
|
||||||
s = s + a[i];
|
s = s + a[i];
|
||||||
}
|
}
|
||||||
|
14
src/main.cpp
14
src/main.cpp
@ -32,8 +32,6 @@ int main() {
|
|||||||
DebugData(); //Prints Debug Data
|
DebugData(); //Prints Debug Data
|
||||||
}
|
}
|
||||||
setLoggerLevel("ALL");
|
setLoggerLevel("ALL");
|
||||||
|
|
||||||
|
|
||||||
ServerMain(Port, MaxPlayers);
|
ServerMain(Port, MaxPlayers);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,18 +59,8 @@ void LogInit(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void addToLog(basic_string<char> Data){
|
void addToLog(basic_string<char> Data){
|
||||||
basic_string<char> LogData = "";
|
|
||||||
ifstream InFileStream;
|
|
||||||
InFileStream.open("Server.log");
|
|
||||||
if(InFileStream.good()){
|
|
||||||
string line;
|
|
||||||
while (getline(InFileStream, line)) {
|
|
||||||
LogData = LogData + line + "\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ofstream LFS;
|
ofstream LFS;
|
||||||
LFS.open ("Server.log");
|
LFS.open ("Server.log", std::ios_base::app);
|
||||||
LFS << LogData;
|
|
||||||
LFS << Data.c_str();
|
LFS << Data.c_str();
|
||||||
LFS.close();
|
LFS.close();
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user