Commit 2aa6c255 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Socket leak fixed.

  Name mapping table modified to prefer mapping hard space to space.
Detail:
  Fixes hard space->space mismapping.
  Doesn't leak sockets during startup if driver isn't ready.
Admin:
  Check-in of previously uncommitted bug fixes to get final version number


Version 2.06. Tagged as 'LanManFS-2_06'
parent 698e4170
/* (2.05)
/* (2.06)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.05
#define Module_MajorVersion_CMHG 2.06
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 16 Mar 1999
#define Module_Date_CMHG 19 Apr 1999
#define Module_MajorVersion "2.05"
#define Module_Version 205
#define Module_MajorVersion "2.06"
#define Module_Version 206
#define Module_MinorVersion ""
#define Module_Date "16 Mar 1999"
#define Module_Date "19 Apr 1999"
#define Module_FullVersion "2.06"
......@@ -2064,6 +2064,8 @@ EXPORT err_t _NB_Startup(void)
printf(" Couldn't find IP address for interface '%s'\n",
LM_Vars.drivername );
}
(void) socketclose(NBNS_Socket);
NBNS_Socket = INVALID_SOCKET;
return ENOIFADDR;
}
......@@ -2092,10 +2094,12 @@ EXPORT err_t _NB_Startup(void)
sa.sin_port = htons(NBNS_PORT);
sa.sin_addr.s_addr = INADDR_ANY;
if ( bind( NBNS_Socket, (struct sockaddr *)&sa, sizeof(sa) ) != 0 )
if ( bind( NBNS_Socket, (struct sockaddr *)&sa, sizeof(sa) ) < 0 )
{
/* Socket will be closed on exit */
debug0("Couldn't bind socket\n");
(void) socketclose(NBNS_Socket);
NBNS_Socket = INVALID_SOCKET;
return ENOSOCKETS;
}
......
......@@ -641,11 +641,11 @@ static const char lanmanfs_lookup_table[257]=
static const char lanmanfs_inverse_lookup_table[257]=
"________________________________"
"\xa0!\"?$%+'()*+,-\\.0123456789:;<=>#"
"\x20!\"?$%+'()*+,-\\.0123456789:;<=>#"
"=ABCDEFGHIJKLMNOPQRSTUVWXYZ[.],_"
"`abcdefghijklmnopqrstuvwxyz{|}~_"
"€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ"
"\xa0¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿"
"\x20¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿"
"ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
"àáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ";
......@@ -654,9 +654,9 @@ static const char lanmanfs_inverse_lookup_table[257]=
* wildcard resolution code function correctly.
*/
static const char lanmanfs_contentious_characters[]=
"+=><,\xa0";
"+=><,\x20";
static const char lanmanfs_contentious_pairing[]=
"&@%$^\x20";
"&@%$^\xa0";
/* Translate DOS names to RISC OS names using the translation table
*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment