Revert "now test server can listen on any ipv4 address."

This reverts commit afe5a2d824.
This commit is contained in:
Norayr Chilingarian 2025-02-21 04:52:20 +04:00
parent afe5a2d824
commit e36e862c8c
3 changed files with 96 additions and 141 deletions

View file

@ -6,7 +6,7 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
various promotion rules changed (long) => (LONGINT), xxxL avoided
*)
IMPORT OPT, OPC, OPM, OPS, VT100, Strings, SYSTEM;
IMPORT OPT, OPC, OPM, OPS, SYSTEM;
CONST
UndefinedType = 0; (* named type not yet defined *)
@ -28,7 +28,6 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
GuardPtrFunc = "__GUARDP(";
GuardRecFunc = "__GUARDR(";
TypeFunc = "__TYPEOF(";
SetOfFunc = "__SETOF(";
CopyFunc = "__COPY(";
MoveFunc = "__MOVE(";
GetFunc = "__GET(";
@ -45,7 +44,7 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
TYPE
ExitInfo = RECORD level, label: INTEGER END ;
tmpName = POINTER TO ARRAY 32 OF CHAR;
VAR
stamp: INTEGER; (* unique number for nested objects *)
@ -53,20 +52,6 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
exit: ExitInfo; (* to check if EXIT is simply a break *)
nofExitLabels: INTEGER;
tempCounter: INTEGER; (* to generate unique temp names *)
PROCEDURE uniqueTempName(): tmpName;
VAR
num: ARRAY 8 OF CHAR;
tempName: tmpName;
BEGIN
INC(tempCounter);
NEW(tempName);
COPY("_voc_tmp_", tempName^);
VT100.IntToStr(tempCounter, num);
Strings.Append(num, tempName^);
RETURN tempName;
END uniqueTempName;
PROCEDURE Init*;
BEGIN
@ -271,39 +256,27 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
END SizeCast;
PROCEDURE Convert(n: OPT.Node; newtype: OPT.Struct; prec: INTEGER);
VAR
from, to: INTEGER;
tempName: tmpName;
tempIndex: INTEGER; (* New variable to manage temporary indexes *)
BEGIN
from := n^.typ^.form;
to := newtype.form;
VAR from, to: INTEGER;
BEGIN from := n^.typ^.form; to := newtype.form;
IF to = OPT.Set THEN
tempName := uniqueTempName();
tempIndex := 0; (* Initialize temp index *)
OPM.WriteString("UINT32 "); OPM.WriteString(tempName^); OPM.WriteString(" = 0;"); (* Correctly initialize variable *)
OPM.WriteLn;
IF from = OPT.Set THEN
IF from = OPT.Set THEN (* Sets of different size *)
SizeCast(n, newtype.size);
ELSE
OPM.WriteString(tempName^); OPM.WriteString(" = __SETOF(");
Entier(n, MinPrec);
OPM.WriteString(",");
OPM.WriteInt(newtype.size * 8);
OPM.WriteString(");");
OPM.WriteLn;
OPM.WriteString("i |= "); OPM.WriteString(tempName^); OPM.WriteString(";"); (* Ensure 'i' is declared *)
ELSE (* Set from integer *)
OPM.WriteString("__SETOF("); Entier(n, MinPrec);
OPM.WriteString(","); OPM.WriteInt(newtype.size*8); OPM.Write(CloseParen)
END
ELSIF to = OPT.Int THEN
ELSIF to = OPT.Int THEN (* integers of different size *)
SizeCast(n, newtype.size);
ELSE
expr(n, prec);
ELSIF to = OPT.Char THEN
IF OPM.ranchk IN OPM.Options THEN OPM.WriteString("__CHR");
IF SideEffects(n) THEN OPM.Write("F") END ;
OPM.Write(OpenParen); Entier(n, MinPrec); OPM.Write(CloseParen)
ELSE OPM.WriteString("(CHAR)"); Entier(n, 9)
END
ELSE expr(n, prec)
END
END Convert;
PROCEDURE TypeOf(n: OPT.Node);
BEGIN
IF n^.typ^.form = OPT.Pointer THEN
@ -796,7 +769,6 @@ END Convert;
PROCEDURE stat(n: OPT.Node; outerProc: OPT.Object);
VAR proc: OPT.Object; saved: ExitInfo; l, r: OPT.Node;
tempName, tempVar: tmpName;
BEGIN
WHILE (n # NIL) & OPM.noerr DO
OPM.errpos := OPM.Longint(n^.conval^.intval);
@ -861,17 +833,9 @@ END Convert;
| OPT.incfn,
OPT.decfn: expr(n^.left, MinPrec); OPC.Increment(n^.subcl = OPT.decfn); expr(n^.right, MinPrec)
| OPT.inclfn,
OPT.exclfn:
tempName := uniqueTempName();
OPM.WriteString("UINT32 "); OPM.WriteString(tempName^); OPM.WriteString(";");
OPM.WriteLn;
OPM.WriteString(tempName^); OPM.WriteString(" = __SETOF(");
expr(n^.right, MinPrec);
OPM.WriteString(","); OPM.WriteInt(n.left.typ.size * 8);
OPM.WriteString(");");
OPM.WriteLn;
OPM.WriteString("i |= "); OPM.WriteString(tempName^); OPM.WriteString(";");
OPT.exclfn: expr(n^.left, MinPrec); OPC.SetInclude(n^.subcl = OPT.exclfn);
OPM.WriteString("__SETOF("); expr(n^.right, MinPrec);
OPM.WriteString(","); OPM.WriteInt(n.left.typ.size*8); OPM.Write(CloseParen)
| OPT.copyfn: OPM.WriteString(CopyFunc);
expr(n^.right, MinPrec); OPM.WriteString(Comma); expr(n^.left, MinPrec); OPM.WriteString(Comma);
Len(n^.left, 0); OPM.Write(CloseParen)
@ -967,7 +931,4 @@ END Convert;
OPC.GenBdy(prog^.right); stat(prog, NIL)
END Module;
BEGIN
tempCounter := 0
END OPV.

View file

@ -39,7 +39,6 @@ VAR
pid: LONGINT;
res: Platform.ErrorCode;
sockaddrlen: LONGINT;
ipAddr: LONGINT; ip: ARRAY 16 OF CHAR;
BEGIN
sockfd := sockets.Socket(sockets.AfInet, sockets.SockStream, 0);
IF sockfd < 0 THEN
@ -48,10 +47,8 @@ BEGIN
Out.String("socket created.")
END;
Out.Ln;
COPY("127.0.0.1", ip);
ipAddr := sockets.inetaddr(ip);
sockets.SetSockAddrIn(sockets.AfInet, Port, ipAddr, ServAddr);
sockets.SetSockAddrIn(sockets.AfInet, Port, 0, ServAddr);
IF sockets.Bind(sockfd, SYSTEM.VAL(sockets.SockAddr, ServAddr), SIZE(sockets.SockAddr)) < 0 THEN
Out.String("error on binding")
ELSE

View file

@ -77,9 +77,6 @@ TYPE
END;
PROCEDURE -includesocket "#include <sys/socket.h>";
PROCEDURE -includeInet "#include <arpa/inet.h>";
PROCEDURE -inetaddr*(s: ARRAY OF CHAR): LONGINT "(LONGINT)inet_addr((char*)s)";
PROCEDURE -SetCShort(i: INTEGER; VAR si: oocC.shortint)
"*(short*)si = i";
@ -87,7 +84,7 @@ TYPE
PROCEDURE -SetCShortSwapped(i: INTEGER; VAR si: oocC.shortint)
"*(short*)si = ((i >> 8) & 0x00ff) | ((i << 8) & 0xff00)";
PROCEDURE SetSockAddrIn*(family, port: INTEGER; inaddr: LONGINT; VAR sai: SockAddrIn);
PROCEDURE SetSockAddrIn*(family, port, inaddr: INTEGER; VAR sai: SockAddrIn);
VAR i: INTEGER;
BEGIN
SetCShort(family, sai.SinFamily);