CC-tea/org-hyperion-cules
1
0
Fork 0
mirror of https://github.com/SDL-Hercules-390/hyperion.git synced 2026-04-20 18:57:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Corrections to fix my recent LCS breakage

Browse Source 
git-svn-id: file:///home/jj/hercules.svn/trunk@3847 956126f8-22a0-4046-8f4a-272fa8102e63
This commit is contained in:
Fish (David B Trout)
2006-04-21 21:48:12 +00:00
parent c50acf5778
commit 8387a89eb5
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ctc_ctci.c
View File

@@ -1082,7 +1082,7 @@ static int ParseArgs( DEVBLK* pDEVBLK, PCTCBLK pCTCBLK,
int iMTU;
int i;
MAC mac; // Work area for MAC address
#if defined(WIN32)
#if defined(OPTION_W32_CTCI)
int iKernBuff;
int iIOBuff;
#endif
@@ -1094,13 +1094,13 @@ static int ParseArgs( DEVBLK* pDEVBLK, PCTCBLK pCTCBLK,
// Set some initial defaults
strcpy( pCTCBLK->szMTU, "1500" );
strcpy( pCTCBLK->szNetMask, "255.255.255.255" );
#if defined( WIN32 )
#if defined( OPTION_W32_CTCI )
strcpy( pCTCBLK->szTUNCharName, tt32_get_default_iface() );
#else
strcpy( pCTCBLK->szTUNCharName, HERCTUN_DEV );
#endif
#if defined( WIN32 )
#if defined( OPTION_W32_CTCI )
pCTCBLK->iKernBuff = DEF_TT32DRV_BUFFSIZE_K * 1024;
pCTCBLK->iIOBuff = DEF_TT32DRV_BUFFSIZE_K * 1024;
#endif
@@ -1205,7 +1205,7 @@ static int ParseArgs( DEVBLK* pDEVBLK, PCTCBLK pCTCBLK,
break;
case 'k': // Kernel Buffer Size (ignored if not Windows)
#if defined( WIN32 )
#if defined( OPTION_W32_CTCI )
iKernBuff = atoi( optarg );
if( iKernBuff < MIN_TT32DLL_BUFFSIZE_K ||
@@ -1221,7 +1221,7 @@ static int ParseArgs( DEVBLK* pDEVBLK, PCTCBLK pCTCBLK,
break;
case 'i': // I/O Buffer Size (ignored if not Windows)
#if defined( WIN32 )
#if defined( OPTION_W32_CTCI )
iIOBuff = atoi( optarg );
if( iIOBuff < MIN_TT32DLL_BUFFSIZE_K ||
@@ -1249,7 +1249,7 @@ static int ParseArgs( DEVBLK* pDEVBLK, PCTCBLK pCTCBLK,
strcpy( pCTCBLK->szMTU, optarg );
break;
case 's': // Netmask of point-to-point link (ignored if Windows)
case 's': // Netmask of point-to-point link
if( inet_aton( optarg, &addr ) == 0 )
{
logmsg( _("HHCCT055E %4.4X: Invalid netmask %s\n"),
@@ -1260,7 +1260,7 @@ static int ParseArgs( DEVBLK* pDEVBLK, PCTCBLK pCTCBLK,
strcpy( pCTCBLK->szNetMask, optarg );
break;
case 'm': // (ignored if not Windows)
case 'm':
if( ParseMAC( optarg, mac ) != 0 )
{
logmsg( _("HHCCT056E %4.4X: Invalid MAC address %s\n"),

6
hercifc.c
View File

@@ -110,6 +110,12 @@ int main( int argc, char **argv )
pIF = ctlreq.iru.ifreq.ifr_name;
break;
case SIOCGIFFLAGS:
pOp = "SIOCGIFFLAGS";
pArg = &ctlreq.iru.ifreq;
pIF = ctlreq.iru.ifreq.ifr_name;
break;
case SIOCSIFMTU:
pOp = "SIOCSIFMTU";
pArg = &ctlreq.iru.ifreq;

1
hostopts.h
View File

@@ -123,6 +123,7 @@
#undef OPTION_TUNTAP_SETNETMASK /* (default initial setting) */
#undef OPTION_TUNTAP_SETMACADDR /* (default initial setting) */
#undef OPTION_TUNTAP_DELADD_ROUTES /* (default initial setting) */
#undef OPTION_TUNTAP_CLRIPADDR /* (default initial setting) */
#if defined(HAVE_DECL_SIOCSIFNETMASK) && \
HAVE_DECL_SIOCSIFNETMASK

28
tuntap.c
View File

@@ -645,26 +645,38 @@ static int IFC_IOCtl( int fd, unsigned long int iRequest, char* argp )
// Select string to represent ioctl request for debugging.
switch (iRequest) {
case SIOCSIFADDR:
#ifdef OPTION_TUNTAP_CLRIPADDR
case SIOCDIFADDR:
request_name="SIOCDIFADDR"; break;
#endif
case SIOCSIFADDR:
request_name="SIOCSIFADDR"; break;
case SIOCSIFDSTADDR:
case SIOCSIFDSTADDR:
request_name="SIOCSIFDSTADDR"; break;
case SIOCSIFMTU:
case SIOCSIFMTU:
request_name="SIOCSIFMTU"; break;
case SIOCSIFFLAGS:
case SIOCSIFFLAGS:
request_name="SIOCSIFFLAGS"; break;
case SIOCGIFFLAGS:
request_name="SIOCGIFFLAGS"; break;
#ifdef OPTION_TUNTAP_SETNETMASK
case SIOCSIFNETMASK:
case SIOCSIFNETMASK:
request_name="SIOCSIFNETMASK"; break;
#endif
#ifdef OPTION_TUNTAP_SETMACADDR
case SIOCSIFHWADDR:
case SIOCSIFHWADDR:
request_name="SIOCSIFHWADDR"; break;
#endif
#ifdef OPTION_TUNTAP_DELADD_ROUTES
case SIOCADDRT:
case SIOCADDRT:
request_name="SIOCADDRT"; break;
case SIOCDELRT:
case SIOCDELRT:
request_name="SIOCDELRT"; break;
#endif
default: