Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

149 host tcpip socket driver #176

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a4ff4fd
Add files via upload
nschulux Sep 11, 2023
0d4e426
Add Host Interface library as abstraction to talk to the host system.…
frehwagen Feb 14, 2024
6f249a0
Host TCP/IP driver cleanup.
frehwagen Mar 20, 2024
80e3b66
Updated Host Interface library and integration into SSL library. #149
frehwagen Mar 25, 2024
ad227f0
Fixing dependencies containing absolut paht and some typos. #149
frehwagen Mar 25, 2024
f9aaa5b
Take Host If library in use. #149
frehwagen Jul 1, 2024
3f35ff7
Add missing C header file for host interface.
frehwagen Jul 1, 2024
7c44747
Some basic cleanup of host tcpip driver, and other fixes.
Jul 5, 2024
d63f2aa
Add files via upload
nschulux Sep 11, 2023
69bd67a
Add Host Interface library as abstraction to talk to the host system.…
frehwagen Feb 14, 2024
58b1e81
Host TCP/IP driver cleanup.
frehwagen Mar 20, 2024
6ba0c2d
Updated Host Interface library and integration into SSL library. #149
frehwagen Mar 25, 2024
9f21acf
Fixing dependencies containing absolut paht and some typos. #149
frehwagen Mar 25, 2024
bfaca0b
Take Host If library in use. #149
frehwagen Jul 1, 2024
6db2365
Fix OpenWith Makefile, strange merge issue?
Jul 7, 2024
c36f183
Fixing Html4Par make files.
Jul 7, 2024
421310d
Makefile and dependency file fixes.
Jul 7, 2024
b43f238
Fix FJPEG.geo naming.
Jul 7, 2024
b92d0b7
Fix ImpGraph dependencies.
Jul 7, 2024
a7dd183
Fix include path for linux.
Jul 8, 2024
557ea12
Fix ImpGraph/FJPEG dependencies file.
Jul 8, 2024
8ec0842
Fix ImpGraph/FJPEG build problem.
Jul 8, 2024
27f2b41
Fixing ImpGraph and Html4Par build issues.
Jul 9, 2024
2d268a3
Fixing geos.ini template merge issues.
Jul 10, 2024
4f5f4bf
Try to fix ResEdit instability, add some more log output.
Jul 10, 2024
3c2d98f
Fix debug log.
Jul 10, 2024
2e17030
Improve debug log
Jul 10, 2024
48c6417
Improve trans logging.
Jul 10, 2024
dcaa8c1
Fixing some merge issues, fixing NewsReader initialization. #149
Jul 16, 2024
f359f99
Reenable connection has been closed event. #149
Aug 13, 2024
1d0ef9d
Chunk size optimization ported for WATCOM, fixed chunked encoding for…
Aug 18, 2024
45dfdf3
Remove all direct calls to host aoi interrupts, use HostIfCall instea…
Oct 4, 2024
05374f8
Remove unused code, PM artifacts. #149
Oct 4, 2024
3706670
Remove code to use GEOS side resolver. #149
Oct 4, 2024
86ced8a
Shift async execution protocol into host interface library, more clea…
Oct 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Appl/Breadbox/BbxBrow/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ GOCFLAGS += $(COMPILE_OPTIONS)
# -Os: favor size of execution speed
# JavaScript code uses #if rather than #ifdef
#XCCOMFLAGS = -d -dc -Z -Os -O $(COMPILE_OPTIONS:S|JAVASCRIPT_SUPPORT|JAVASCRIPT_SUPPORT=1|g)
XCCOMFLAGS = $(COMPILE_OPTIONS:S|JAVASCRIPT_SUPPORT|JAVASCRIPT_SUPPORT=1|g)
XCCOMFLAGS = -zu -zc $(COMPILE_OPTIONS:S|JAVASCRIPT_SUPPORT|JAVASCRIPT_SUPPORT=1|g)

# -N: Add stack probes to every routine (only for EC builds)
#ifndef NO_EC
Expand Down
20 changes: 17 additions & 3 deletions Appl/Breadbox/BbxBrow/navigate/NAVIGATE.goc
Original file line number Diff line number Diff line change
Expand Up @@ -1130,9 +1130,23 @@ Boolean CheckNoISP(void)
{
word activeAP;
Boolean apError = TRUE;
TCHAR apCat[20];
word datasize;

TCHAR apCat[33];
word datasize=0;

if (!InitFileReadStringBuffer("tcpip", "driver",
apCat, sizeof(apCat), &datasize)) {

#ifdef ERROR_CHECK
if(strcmp(apCat, "EC Host TCP/IP Driver") == 0) {
return FALSE;
}
else
if(strcmp(apCat, "Host TCP/IP Driver") == 0) {
return FALSE;
}
#endif
}

if (!InitFileReadInteger("accpnt", "active1", &activeAP)) {
if (activeAP) {
@ifdef DO_DBCS
Expand Down
4 changes: 2 additions & 2 deletions Appl/Breadbox/BbxChat/Interfac.goc
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@
/*---------------------------------------------------------------------*/
@object GenTextClass ConnectSiteName = {
GI_visMoniker = "Site:" ;
GTXI_text = "irc.breadbox.com" ;
GTXI_text = "irc.dal.net" ;
HINT_EXPAND_WIDTH_TO_FIT_PARENT ;
ATTR_GEN_INIT_FILE_KEY = "site" ;
HINT_TEXT_SELECT_TEXT ;
Expand Down Expand Up @@ -831,7 +831,7 @@
/*---------------------------------------------------------------------*/
@object GenTextClass ConnectSiteChannel = {
GI_visMoniker = "Channel:" ;
GTXI_text = "\043TheBreadboxChannel" ;
GTXI_text = "\043TheFreeGeosChannel" ;
GTXI_attrs = @default | GTA_SINGLE_LINE_TEXT ;
GTXI_maxLength = 70 ;
HINT_EXPAND_WIDTH_TO_FIT_PARENT ;
Expand Down
1 change: 1 addition & 0 deletions Appl/Breadbox/NewsRead/Main/NData3.goc
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ Boolean NewsDataStoreArticle(ArticleEntry *p_article)
ICreateRefList(p_refLine, &refList) ;

/* Ok, we have all of our references */
articleIndex = NEWS_DATA_ARTICLE_NONE;
if (refList.MRL_numRef > 0)
articleIndex = IFindThreadWithReference(p_refLine, &refList) ;
if (p_refLine)
Expand Down
23 changes: 18 additions & 5 deletions Appl/IDialup/IDialapp.goc
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ static void SendFlashNotification(void);
@method IDialupAppClass, MSG_IDA_VIEW_CONNECTION
{
TCHAR *str;

int type;

MemLock(OptrToHandle(@idialStr));
str = LMemDeref(@idialStr);
@call IDInfoGroup::MSG_GEN_SET_NOT_USABLE(VUM_DELAYED_VIA_UI_QUEUE);
Expand All @@ -143,10 +144,24 @@ static void SendFlashNotification(void);

@call IDConnectionGroup::MSG_GEN_SET_USABLE(VUM_DELAYED_VIA_UI_QUEUE);
@send IDialupPrimary::MSG_GEN_RESET_TO_INITIAL_SIZE(VUM_DELAYED_VIA_UI_QUEUE);

if (AccessPointGetIntegerPropertyDirect(currentAccpnt, "netType", (int*) &type))
type = 0 ;
/* enable delete and modify only if there are access points defined that are
* editable, type 2 is host-network type, so not editable */
if( connectionNum && ( type != 2 ) )
{
@call IDModifyConnectionButton::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDDeleteConnectionButton::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
}
else
{
@call IDModifyConnectionButton::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDDeleteConnectionButton::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
}

if(connectionNum)
{
@call IDModifyConnectionButton::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDDeleteConnectionButton::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDConnectButton::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
/*#if _NDO2000
/*#else
Expand All @@ -155,8 +170,6 @@ static void SendFlashNotification(void);
}
else
{
@call IDModifyConnectionButton::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDDeleteConnectionButton::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDConnectButton::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
/*#if _NDO2000
/*#else
Expand Down
74 changes: 53 additions & 21 deletions Appl/IDialup/IDialup.goc
Original file line number Diff line number Diff line change
Expand Up @@ -1359,8 +1359,6 @@ AccessPointLocalDialingOptions GetLocalDialingOptions (void)

if(connectionNum)
{
@call IDModifyConnectionButton::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDDeleteConnectionButton::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
/*#if _NDO2000
/*#else
@call IDNewNumbers::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
Expand All @@ -1369,8 +1367,6 @@ AccessPointLocalDialingOptions GetLocalDialingOptions (void)
}
else
{
@call IDModifyConnectionButton::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDDeleteConnectionButton::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
/*#if _NDO2000
/*#else
@call IDNewNumbers::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
Expand All @@ -1395,8 +1391,7 @@ AccessPointLocalDialingOptions GetLocalDialingOptions (void)
{
@send IDConnectionList::MSG_GEN_ITEM_GROUP_SET_SINGLE_SELECTION(tmpItem, 0);
}



/* if there is only 1 access point then let's make it the default
access point automagically... jfh 2/19/02 */
if ((connectionNum == 1) && !defaultAccpnt) {
Expand Down Expand Up @@ -1431,6 +1426,21 @@ AccessPointLocalDialingOptions GetLocalDialingOptions (void)
word datalen;
TCHAR name[MAX_TEXT_LEN];
MemHandle mh;
int type;

if (AccessPointGetIntegerPropertyDirect(currentAccpnt, "netType", (int*) &type))
type = 0 ;
if( connectionNum && ( type != 2 ) )
{
@call IDModifyConnectionButton::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDDeleteConnectionButton::MSG_GEN_SET_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
}
else
{
@call IDModifyConnectionButton::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
@call IDDeleteConnectionButton::MSG_GEN_SET_NOT_ENABLED(VUM_DELAYED_VIA_UI_QUEUE);
}


if(!AccessPointGetIntegerPropertyDirect(currentAccpnt, DEFAULT_KEY, (int*) &datalen)
&& datalen != 0)
Expand Down Expand Up @@ -1889,24 +1899,46 @@ void IDialupUpdateEditOKButton(void)

if (AccessPointGetIntegerPropertyDirect(currentAccpnt, "netType", (int*) &netType))
netType = 0 ;
InitFileReadStringBuffer("tcpip", "link", buffer, sizeof(buffer)-1, &size) ;

InitFileReadStringBuffer("tcpip", "driver", buffer, sizeof(buffer)-1, &size) ;
buffer[size] = '\0' ;
if (netType) {
NEC(char *link = "ODI Ethernet Driver" ; )
EC(char *link = "EC ODI Ethernet Driver" ; )
if ((strlen(buffer)) && (strcmp(link, buffer)!=0))
changed = TRUE ;
InitFileWriteString("tcpip", "link", link) ;
InitFileWriteString("tcpip", "linkDomain", "EtherODI") ;
InitFileDeleteEntry("tcpip", "linkPermname") ;
if( netType == 2 ) {
NEC(char *driver = "Host TCP/IP Driver" ; )
EC(char *driver = "EC Host TCP/IP Driver" ; )
if ((strlen(buffer)) && (strcmp(driver, buffer)!=0))
changed = TRUE ;
InitFileWriteString("tcpip", "driver", driver) ;

InitFileDeleteEntry("tcpip", "link") ;
InitFileWriteString("tcpip", "linkDomain", "Host") ;
InitFileDeleteEntry("tcpip", "linkPermname") ;

} else {
NEC(char *ppplink = "PPP Driver" ; )
EC(char *ppplink = "EC PPP Driver" ; )
if ((strlen(buffer)) && (strcmp(ppplink, buffer)!=0))
NEC(char *driver = "TCP/IP Driver" ; )
EC(char *driver = "EC TCP/IP Driver" ; )
if ((strlen(buffer)) && (strcmp(driver, buffer)!=0))
changed = TRUE ;
InitFileWriteString("tcpip", "driver", driver) ;

InitFileReadStringBuffer("tcpip", "link", buffer, sizeof(buffer)-1, &size) ;
buffer[size] = '\0' ;
if (netType == 1) {
NEC(char *link = "ODI Ethernet Driver" ; )
EC(char *link = "EC ODI Ethernet Driver" ; )
if ((strlen(buffer)) && (strcmp(link, buffer)!=0))
changed = TRUE ;
InitFileWriteString("tcpip", "link", link) ;
InitFileWriteString("tcpip", "linkDomain", "EtherODI") ;
InitFileDeleteEntry("tcpip", "linkPermname") ;
} else {
NEC(char *ppplink = "PPP Driver" ; )
EC(char *ppplink = "EC PPP Driver" ; )
if ((strlen(buffer)) && (strcmp(ppplink, buffer)!=0))
changed = TRUE ;
InitFileWriteString("tcpip", "link", ppplink) ;
InitFileWriteString("tcpip", "linkDomain", "PPP") ;
InitFileWriteString("tcpip", "linkPermname", "ppp") ;
InitFileWriteString("tcpip", "link", ppplink) ;
InitFileWriteString("tcpip", "linkDomain", "PPP") ;
InitFileWriteString("tcpip", "linkPermname", "ppp") ;
}
}

if (changed) {
Expand Down
8 changes: 4 additions & 4 deletions Appl/IDialup/idialup.gp
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
##############################################################################
#
# PROJECT:
# FILE: idial.gp
# PROJECT:
# FILE: idial.gp
#
# AUTHOR: Mingzhe Zhu, Nov 21, 1998
#
#
#
#
#
# $Id: $
#
#
##############################################################################

name IDialup.app
Expand Down
2 changes: 1 addition & 1 deletion Appl/SDK_C/Help/HelpSamp/helpsamp.gp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# ---- ---- -----------
# PjD 1/22/93 Initial version
# NF 10/7/96 Corrected heapspace value
# RainerB 4/27/2022 Resource names adjusted for Watcom compatibility
# RainerB 4/27/2022 Resource names adjusted for Watcom compatibility
#
# RCS STAMP:
# $Id: helpsamp.gp,v 1.1 97/04/04 16:38:56 newdeal Exp $
Expand Down
2 changes: 1 addition & 1 deletion Appl/SDK_C/Help/HelpTrig/helptrig.gp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Name Date Description
# ---- ---- -----------
# gene 12/8/92 Initial version
# RainerB 4/27/2022 Resource names adjusted for Watcom compatibility
# RainerB 4/27/2022 Resource names adjusted for Watcom compatibility
#
# RCS STAMP:
# $Id: helptrig.gp,v 1.1 97/04/04 16:38:53 newdeal Exp $
Expand Down
2 changes: 1 addition & 1 deletion Appl/SDK_C/Help/HelpView/helpview.gp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Name Date Description
# ---- ---- -----------
# gene 12/8/92 Initial version
# RainerB 4/27/2022 Resource names adjusted for Watcom compatibility
# RainerB 4/27/2022 Resource names adjusted for Watcom compatibility
#
# RCS STAMP:
# $Id: helpview.gp,v 1.1 97/04/04 16:38:58 newdeal Exp $
Expand Down
15 changes: 15 additions & 0 deletions Appl/SDK_C/Help/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
In order to use this programs fully, you must create the required help files:
HelpSamp: circles, helpsamp, and squares
HelpTrig: helptrig
HelpView: helpview

These files must be located in the following folder:
<geos root directory>\USERDATA\HELP

To generate a help file, you have to enable the help editor in
GeoWrite and generate the file under the Help Editor menu. See the
Help Objects chapter of the Objects book for full details.

For convenience, you may also copy 5 existing help files and rename
them according to the list above.

2 changes: 1 addition & 1 deletion Appl/SDK_C/Wavsamp/wavsamp.gp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Name Date Description
# ---- ---- -----------
# dubois 12/6/93 Initial version
# RainerB 4/27/2022 Resource names adjusted for Watcom compatibility
# RainerB 4/27/2022 Resource names adjusted for Watcom compatibility
#
# DESCRIPTION:
# This file contatins Geode definitions for the "Wavsamp"
Expand Down
19 changes: 19 additions & 0 deletions Appl/Tools/Localize/Main/mainBatch.asm
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ REVISION HISTORY:

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%@
translationFileToken GeodeToken < "TRNS", MANUFACTURER_ID_GEOWORKS >
stepText char ".\r"


REARunBatchJob method dynamic ResEditProcessClass,
MSG_RESEDIT_RUN_BATCH_JOB
Expand Down Expand Up @@ -129,6 +131,16 @@ fileEnumParams local FileEnumParams
; remember the log file handle to be used in the batch process
mov es:[batchLogFile], ax

;mov bx, ax
;mov al, FILE_NO_ERRORS
;mov cx, 2
;push ds
;segmov ds, cs
;mov dx, offset stepText
;call FileWrite
;mov al, FILE_NO_ERRORS
;call FileCommit
;pop ds
logFileError:
call MemFree ; free block with handle in bx
call FilePopDir
Expand Down Expand Up @@ -803,6 +815,9 @@ noOptr:

mov al, FILE_NO_ERRORS
call FileWrite

mov al, FILE_NO_ERRORS
call FileCommit
pop dx

pop dx, bp, ax, es, di
Expand Down Expand Up @@ -929,6 +944,8 @@ BatchReportReturn proc far
mov cx, 2
mov al, FILE_NO_ERRORS
call FileWrite
mov al, FILE_NO_ERRORS
call FileCommit
noAutorun:
pop ds
mov ax, MSG_VIS_TEXT_APPEND
Expand Down Expand Up @@ -990,6 +1007,8 @@ BatchReportTab proc far
mov cx, 1
mov al, FILE_NO_ERRORS
call FileWrite
mov al, FILE_NO_ERRORS
call FileCommit
noAutorun:
pop ds
mov ax, MSG_VIS_TEXT_APPEND
Expand Down
10 changes: 5 additions & 5 deletions CInclude/cookies.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Cookie routines */
optr _pascal CookieFind(TCHAR *anchorPath, TCHAR *anchorHost, Boolean secure) ;
void _pascal CookieParse(TCHAR *anchorPath, TCHAR *anchorHost, char *cTxt) ;
void _pascal CookieSet(
optr _pascal _export CookieFind(TCHAR *anchorPath, TCHAR *anchorHost, Boolean secure) ;
void _pascal _export CookieParse(TCHAR *anchorPath, TCHAR *anchorHost, char *cTxt) ;
void _pascal _export CookieSet(
TCHAR *anchorPath,
TCHAR *anchorHost,
const char *name,
Expand All @@ -10,8 +10,8 @@ void _pascal CookieSet(
const char *path,
const char *domain,
Boolean secure) ;
void _pascal CookiesWrite(void) ;
void _pascal _export CookiesWrite(void) ;
//void _pascal CookiesCleanup(void) ;

/* Utility routines */
void _pascal CookieParseTime(char *p, TimerDateAndTime *t) ;
void _pascal _export CookieParseTime(char *p, TimerDateAndTime *t) ;
Loading