|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Support::Windows Servers Support forum for Windows EQEMu users. |
05-22-2015, 01:38 PM
|
Dragon
|
|
Join Date: Apr 2009
Location: California
Posts: 814
|
|
Hm. Wonder if it's a serialization issue, then. Total number of characters in character names going over a certain accidental limit based on buffer size?
|
05-22-2015, 01:41 PM
|
|
Demi-God
|
|
Join Date: Nov 2007
Posts: 2,175
|
|
I have no idea Shendare, this surpasses my knowledge of C++. Some things I can do and figure out but when you get into the streaming of data from client to server, that is past me. I will get there one day and this has been a great learning experience.
I will not post the magic combination here, but give it to the power that be.
EDIT: Just to be sure it is not my server that has something screwed up, I did it on PEQTGC and it crashed, 5 characters with the same combination. It boils down to the total character length of the characters names being a certain number.
|
05-22-2015, 04:06 PM
|
|
Demi-God
|
|
Join Date: Nov 2007
Posts: 2,175
|
|
Drajor and Uleat I sent both of you a packet dump
|
05-22-2015, 07:17 PM
|
|
Developer
|
|
Join Date: Apr 2012
Location: North Carolina
Posts: 2,815
|
|
I just committed a change that may address this issue.
Give it a shot and see it that helps.
EDIT: That will clean up my coding..if there's still an issue, it should be a little easier to trace.
__________________
Uleat of Bertoxxulous
Compilin' Dirty
|
05-22-2015, 07:51 PM
|
|
Demi-God
|
|
Join Date: Nov 2007
Posts: 2,175
|
|
Roger that. Probably will be Saturday before I can test it, but I definitely will. Thanks for looking into it, also excited to see what the change was.
|
05-22-2015, 07:59 PM
|
|
Developer
|
|
Join Date: Apr 2012
Location: North Carolina
Posts: 2,815
|
|
Since the buffer was an allocation and not an initialization, it would be possible to have the character at eq_cse.Name[<strlen> + 1]
not be 0...
And since I was taking name strlen from the eq buffer and not emu buffer, it could have thrown off the length of the entry.
If you still have issues, let me know and I'll look at the server generation code.
__________________
Uleat of Bertoxxulous
Compilin' Dirty
|
|
|
|
05-23-2015, 08:54 AM
|
|
Demi-God
|
|
Join Date: Nov 2007
Posts: 2,175
|
|
One of my servers is working off January source, and until I can move some of my custom things over, I am going to have to keep using that source. These are the lines I will have to change if I am thinking right.
Code:
bufptr += strlen(emu->name[r]);
And add this, like you did, which both will have to be done differently. The entire function has changed.
Code:
eq_cse->Name[0] = '\0';
This is the current function in total.
Code:
ENCODE(OP_SendCharInfo)
{
ENCODE_LENGTH_EXACT(CharacterSelect_Struct);
SETUP_VAR_ENCODE(CharacterSelect_Struct);
//EQApplicationPacket *packet = *p;
//const CharacterSelect_Struct *emu = (CharacterSelect_Struct *) packet->pBuffer;
int char_count;
int namelen = 0;
for (char_count = 0; char_count < 10; char_count++) {
if (emu->name[char_count][0] == '\0')
break;
if (strcmp(emu->name[char_count], "<none>") == 0)
break;
namelen += strlen(emu->name[char_count]);
}
int total_length = sizeof(structs::CharacterSelect_Struct)
+ char_count * sizeof(structs::CharacterSelectEntry_Struct)
+ namelen;
ALLOC_VAR_ENCODE(structs::CharacterSelect_Struct, total_length);
//unsigned char *eq_buffer = new unsigned char[total_length];
//structs::CharacterSelect_Struct *eq_head = (structs::CharacterSelect_Struct *) eq_buffer;
eq->char_count = char_count;
eq->total_chars = 10;
unsigned char *bufptr = (unsigned char *)eq->entries;
int r;
for (r = 0; r < char_count; r++) {
{ //pre-name section...
structs::CharacterSelectEntry_Struct *eq2 = (structs::CharacterSelectEntry_Struct *) bufptr;
eq2->level = emu->level[r];
eq2->hairstyle = emu->hairstyle[r];
eq2->gender = emu->gender[r];
memcpy(eq2->name, emu->name[r], strlen(emu->name[r]) + 1);
}
//adjust for name.
bufptr += strlen(emu->name[r]);
{ //post-name section...
structs::CharacterSelectEntry_Struct *eq2 = (structs::CharacterSelectEntry_Struct *) bufptr;
eq2->beard = emu->beard[r];
eq2->haircolor = emu->haircolor[r];
eq2->face = emu->face[r];
int k;
for (k = 0; k < _MaterialCount; k++) {
eq2->equip[k].material = emu->equip[r][k].material;
eq2->equip[k].unknown1 = emu->equip[r][k].unknown1;
eq2->equip[k].elitematerial = emu->equip[r][k].elitematerial;
eq2->equip[k].color.color = emu->equip[r][k].color.color;
}
eq2->primary = emu->primary[r];
eq2->secondary = emu->secondary[r];
eq2->tutorial = emu->tutorial[r]; // was u15
eq2->u15 = 0xff;
eq2->deity = emu->deity[r];
eq2->zone = emu->zone[r];
eq2->u19 = 0xFF;
eq2->race = emu->race[r];
eq2->gohome = emu->gohome[r];
eq2->class_ = emu->class_[r];
eq2->eyecolor1 = emu->eyecolor1[r];
eq2->beardcolor = emu->beardcolor[r];
eq2->eyecolor2 = emu->eyecolor2[r];
eq2->drakkin_heritage = emu->drakkin_heritage[r];
eq2->drakkin_tattoo = emu->drakkin_tattoo[r];
eq2->drakkin_details = emu->drakkin_details[r];
}
bufptr += sizeof(structs::CharacterSelectEntry_Struct);
}
FINISH_ENCODE();
}
|
|
|
|
05-23-2015, 08:58 AM
|
|
Demi-God
|
|
Join Date: Nov 2007
Posts: 2,175
|
|
Compiling now, I will report back.
Yeah, still crashing before character select.
|
|
|
|
05-23-2015, 07:17 PM
|
|
Developer
|
|
Join Date: Apr 2012
Location: North Carolina
Posts: 2,815
|
|
I pushed a memset as well in the charsel-gen code..but, that likely won't help your case.
Let me look over what you have in this encode.
I'm assuming that you're still using the Ti-based character select struct? (pre-variable toons per client version)
EDIT: Your
Code:
memcpy(eq2->name, emu->name[r], strlen(emu->name[r]) + 1);
essentially does the same thing as the Name[0] = '\0' - assuming that the server gen code has a proper nullterm.
Still looking over it..I'm not seeing an immediate problem..but, might need to compare the structs to make sure something isn't off there.
EDIT2: Does your UF::structs::CharacterSelectEntry_Struct have its name field declared as char name[1] or char name[0]?
EDIT3: Ok, just did a diff of crash/no crash hex dumps after adding in the 'ppy' to the crash one - there was no difference.
The packet structure appears to be properly filled in the crash version and I'm just not seeing anything in the encode function that would cause this.
Have you tried running it without the scope declarations? I'm wondering if the wrong struct isn't being referenced for size...
__________________
Uleat of Bertoxxulous
Compilin' Dirty
Last edited by Uleat; 05-23-2015 at 09:41 PM..
|
|
|
|
05-24-2015, 09:09 AM
|
|
Demi-God
|
|
Join Date: Nov 2007
Posts: 2,175
|
|
Uleat are you getting your client to crash on your end? I am just wondering if you are able to replicate the problem yourself?
|
05-24-2015, 06:40 PM
|
|
Developer
|
|
Join Date: Apr 2012
Location: North Carolina
Posts: 2,815
|
|
Nothing here..hence my somewhat random approach.
I'm just going over potholes in the server code and reviewing what you posted above.
__________________
Uleat of Bertoxxulous
Compilin' Dirty
|
05-24-2015, 06:44 PM
|
|
Demi-God
|
|
Join Date: Nov 2007
Posts: 2,175
|
|
It always does it for me using UF when the character name count with all characters in the account hits 38. Tried it on two servers with the same result, one being PEQTGC.
|
05-24-2015, 06:57 PM
|
|
Developer
|
|
Join Date: Apr 2012
Location: North Carolina
Posts: 2,815
|
|
Ahh, kk..last I tried was 7-char names. I'll take a look at the 38 count.
EDIT: I did one better..I created an account and used all of your names...
Yes, it crashed..so, it is definitely reproduceable in the base code.
__________________
Uleat of Bertoxxulous
Compilin' Dirty
Last edited by Uleat; 05-24-2015 at 10:31 PM..
|
05-24-2015, 10:44 PM
|
|
Developer
|
|
Join Date: Apr 2012
Location: North Carolina
Posts: 2,815
|
|
[Sun May 24 22:25:07 2015]01870:fatal error in main thread Code = c0000005 ADDR=0x2e4080c0
Buffer overrun...
__________________
Uleat of Bertoxxulous
Compilin' Dirty
|
05-24-2015, 10:47 PM
|
|
Demi-God
|
|
Join Date: Nov 2007
Posts: 2,175
|
|
How did you get a buffer overrun? Where did that present itself?
|
Posting Rules
|
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts
HTML code is Off
|
|
|
All times are GMT -4. The time now is 08:03 PM.
|
|
|
|
|
|
|
|
|
|
|
|
|