Apple-2gs-SW
/
gopher
mirror of https://github.com/ksherlock/gopher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move common message dumping code to read_response

This commit is contained in:
Kelvin Sherlock 2014-09-03 13:55:52 -04:00
parent e3346e4598
commit 3108c5f050
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
smb.c
View File

@ -233,6 +233,7 @@ static Handle read_response(Word ipid)
uint8_t nbthead[4];
LongWord qtick;
Word terr;
Handle h;
qtick = GetTick() + 30 * 60;
for(;;)
@ -290,8 +291,27 @@ static Handle read_response(Word ipid)
}
terr = TCPIPReadTCP(ipid, 2, (Ref)0, size, &rb);
return rb.rrBuffHandle;
h = rb.rrBuffHandle;
if (h)
{
smb_response *responsePtr;
HLock(h);
responsePtr = *(smb_response **)h;
dump_response(responsePtr);
if (
responsePtr->header.protocol_id != SMB2_MAGIC ||
responsePtr->header.structure_size != 64)
{
DisposeHandle(h);
fprintf(stderr, "Invalid SMB2 header\n");
return NULL;
}
}
return h;
}
@ -398,7 +418,7 @@ restart:
}
}
fprintf(stdout, "%02x %02x\n", tag, len);
//fprintf(stdout, "%02x %02x\n", tag, len);
switch(tag)
{
@ -514,19 +534,8 @@ int negotiate(Word ipid, uint16_t *path)
if (!h) return -1;
HLock(h);
//hexdump(*h, GetHandleSize(h));
responsePtr = *(smb_response **)h;
dump_response(responsePtr);
if (responsePtr->header.protocol_id != SMB2_MAGIC || responsePtr->header.structure_size != 64)
{
DisposeHandle(h);
fprintf(stderr, "Invalid SMB2 header\n");
return -1;
}
if (responsePtr->header.command != SMB2_NEGOTIATE)
{
DisposeHandle(h);
@ -580,15 +589,6 @@ int negotiate(Word ipid, uint16_t *path)
responsePtr = *(smb_response **)h;
dump_response(responsePtr);
if (responsePtr->header.protocol_id != SMB2_MAGIC || responsePtr->header.structure_size != 64)
{
DisposeHandle(h);
fprintf(stderr, "Invalid SMB2 header\n");
return -1;
}
if (responsePtr->header.command != SMB2_SESSION_SETUP)
{
DisposeHandle(h);
@ -647,15 +647,6 @@ int negotiate(Word ipid, uint16_t *path)
responsePtr = *(smb_response **)h;
dump_response(responsePtr);
if (responsePtr->header.protocol_id != SMB2_MAGIC || responsePtr->header.structure_size != 64)
{
DisposeHandle(h);
fprintf(stderr, "Invalid SMB2 header\n");
return -1;
}
if (responsePtr->header.command != SMB2_TREE_CONNECT)
{
DisposeHandle(h);