Commit 1fdd018d authored by Ben Avison's avatar Ben Avison
Browse files

Brought up-to-date with respect to Tungsten ROM releases - sources from

Kevin's hard disc.
Also automated version numbering of !Run/!Boot/!Help/AUNMap.

Version 5.42. Tagged as 'Internet-5_42'
parent a4b3fb30
**/s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true **/s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
awk/** gitlab-language=awk linguist-language=awk linguist-detectable=true
**/c/** gitlab-language=c linguist-language=c linguist-detectable=true **/c/** gitlab-language=c linguist-language=c linguist-detectable=true
**/h/** gitlab-language=c linguist-language=c linguist-detectable=true **/h/** gitlab-language=c linguist-language=c linguist-detectable=true
...@@ -42,6 +42,7 @@ ATTR = -attr ...@@ -42,6 +42,7 @@ ATTR = -attr
CP = copy CP = copy
RM = remove RM = remove
WIPE = -wipe WIPE = -wipe
AWK = GNU.gawk
CPFLAGS = ~cfr~v CPFLAGS = ~cfr~v
WFLAGS = ~c~v WFLAGS = ~c~v
...@@ -58,8 +59,6 @@ COMMONFILES=\ ...@@ -58,8 +59,6 @@ COMMONFILES=\
${SDIR}.sysctl.SysCtl\ ${SDIR}.sysctl.SysCtl\
${SDIR}.traceroute.TraceRoute ${SDIR}.traceroute.TraceRoute
# ${SDIR}.utils.utl.X
STBFILES=${SDIR}.pong.Pong STBFILES=${SDIR}.pong.Pong
DISCFILES= ${RDIR}.!Boot\ DISCFILES= ${RDIR}.!Boot\
...@@ -90,6 +89,22 @@ FILES=\ ...@@ -90,6 +89,22 @@ FILES=\
${COMMONFILES} \ ${COMMONFILES} \
${DISCFILES} \ ${DISCFILES} \
${STBFILE} ${STBFILE}
BAREMINUTILS = \
${SDIR}.ifconfig.IfConfig \
${SDIR}.ping.Ping \
${RDIR}.!Boot
EMERGENCYUTILS = \
${SDIR}.arp.ARP \
${SDIR}.ifconfig.IfConfig \
${SDIR}.ping.Ping \
${SDIR}.pong.Pong \
${SDIR}.utils.utl.CheckMem \
${SDIR}.newfiler.NewFiler \
${SDIR}.sysctl.SysCtl \
${RDIR}.!Boot \
${RDIR}.!Run \
NETUTILS = \ NETUTILS = \
${SDIR}.arp.ARP \ ${SDIR}.arp.ARP \
...@@ -136,7 +151,7 @@ install_common: ${COMMONFILES} ...@@ -136,7 +151,7 @@ install_common: ${COMMONFILES}
install_STB: ${STBFILES} install_STB: ${STBFILES}
${MKDIR} ${INSTAPP}.files ${MKDIR} ${INSTAPP}.files
${CP} LocalUserIFRes:!Boot ${INSTAPP}.!Boot ${CPFLAGS} ${AWK} -f awk.Version LocalUserIFRes:!Boot > ${INSTAPP}.!Boot
${CP} LocalUserIFRes:CopyLocal ${INSTAPP}.CopyLocal ${CPFLAGS} ${CP} LocalUserIFRes:CopyLocal ${INSTAPP}.CopyLocal ${CPFLAGS}
${CP} LocalUserIFRes:RTime ${INSTAPP}.bin.RTime ${CPFLAGS} ${CP} LocalUserIFRes:RTime ${INSTAPP}.bin.RTime ${CPFLAGS}
${CP} ${SDIR}.pong.Pong ${INSTAPP}.bin.Pong ${CPFLAGS} ${CP} ${SDIR}.pong.Pong ${INSTAPP}.bin.Pong ${CPFLAGS}
...@@ -147,9 +162,9 @@ install_STB: ${STBFILES} ...@@ -147,9 +162,9 @@ install_STB: ${STBFILES}
${CP} ${RDIR}.files.Services ${INSTAPP}.files.Services ${CPFLAGS} ${CP} ${RDIR}.files.Services ${INSTAPP}.files.Services ${CPFLAGS}
install_: ${DISCFILES} dirs install_: ${DISCFILES} dirs
${CP} ${RDIR}.!Boot ${INSTAPP}.!Boot ${CPFLAGS} ${AWK} -f awk.Version ${RDIR}.!Boot > ${INSTAPP}.!Boot
${CP} ${LDIR}.!Help ${INSTAPP}.!Help ${CPFLAGS} ${AWK} -f awk.Version ${LDIR}.!Help > ${INSTAPP}.!Help
${CP} ${RDIR}.!Run ${INSTAPP}.!Run ${CPFLAGS} ${AWK} -f awk.Version ${RDIR}.!Run > ${INSTAPP}.!Run
${CP} ${RDIR}.!Sprites ${INSTAPP}.!Sprites ${CPFLAGS} ${CP} ${RDIR}.!Sprites ${INSTAPP}.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS} ${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
${CP} ${RDIR}.bin ${INSTAPP}.bin ${CPFLAGS} ${CP} ${RDIR}.bin ${INSTAPP}.bin ${CPFLAGS}
...@@ -202,17 +217,47 @@ resources-NetUtils: ${NETUTILS} ...@@ -202,17 +217,47 @@ resources-NetUtils: ${NETUTILS}
${CP} ${SDIR}.sysctl.SysCtl ${RESD}.bin.SysCtl ${CPFLAGS} ${CP} ${SDIR}.sysctl.SysCtl ${RESD}.bin.SysCtl ${CPFLAGS}
${CP} ${SDIR}.showstat.ShowStat ${RESD}.bin.ShowStat ${CPFLAGS} ${CP} ${SDIR}.showstat.ShowStat ${RESD}.bin.ShowStat ${CPFLAGS}
${CP} ${SDIR}.traceroute.TraceRoute ${RESD}.bin.TraceRoute ${CPFLAGS} ${CP} ${SDIR}.traceroute.TraceRoute ${RESD}.bin.TraceRoute ${CPFLAGS}
${CP} ${SDIR}.utils.utl.X ${RESD}.bin.X ${CPFLAGS} ${AWK} -f awk.Version ${RDIR}.files.AUNMap > ${RESD}.files.AUNMap
${CP} ${RDIR}.files.AUNMap ${RESD}.files.AUNMap ${CPFLAGS}
${CP} ${RDIR}.files.Hosts ${RESD}.files.Hosts ${CPFLAGS} ${CP} ${RDIR}.files.Hosts ${RESD}.files.Hosts ${CPFLAGS}
${CP} ${RDIR}.files.Networks ${RESD}.files.Networks ${CPFLAGS} ${CP} ${RDIR}.files.Networks ${RESD}.files.Networks ${CPFLAGS}
${CP} ${RDIR}.files.Protocols ${RESD}.files.Protocols ${CPFLAGS} ${CP} ${RDIR}.files.Protocols ${RESD}.files.Protocols ${CPFLAGS}
${CP} ${RDIR}.files.Services ${RESD}.files.Services ${CPFLAGS} ${CP} ${RDIR}.files.Services ${RESD}.files.Services ${CPFLAGS}
${CP} ${RDIR}.!Boot ${RESD}.!Boot ${CPFLAGS} ${AWK} -f awk.Version ${RDIR}.!Boot > ${RESD}.!Boot
${CP} ${RDIR}.!Run ${RESD}.!Run ${CPFLAGS} ${AWK} -f awk.Version ${RDIR}.!Run > ${RESD}.!Run
${CP} ${RDIR}.!Sprites ${RESD}.!Sprites ${CPFLAGS} ${CP} ${RDIR}.!Sprites ${RESD}.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${RESD}.!Sprites22 ${CPFLAGS} ${CP} ${RDIR}.!Sprites22 ${RESD}.!Sprites22 ${CPFLAGS}
resources-EmergencyUtils: ${EMERGENCYUTILS}
${MKDIR} ${RESD}
${MKDIR} ${RESD}.bin
${MKDIR} ${RESD}.utils
${MKDIR} ${RESD}.files
${CP} ${SDIR}.arp.ARP ${RESD}.bin.ARP ${CPFLAGS}
${CP} ${SDIR}.ifconfig.IfConfig ${RESD}.bin.IfConfig ${CPFLAGS}
${CP} ${SDIR}.ping.Ping ${RESD}.bin.Ping ${CPFLAGS}
${CP} ${SDIR}.pong.Pong ${RESD}.bin.Pong ${CPFLAGS}
${CP} ${SDIR}.utils.utl.CheckMem ${RESD}.utils.CheckMem ${CPFLAGS}
${CP} ${SDIR}.newfiler.NewFiler ${RESD}.utils.NewFiler ${CPFLAGS}
${CP} ${SDIR}.sysctl.SysCtl ${RESD}.bin.SysCtl ${CPFLAGS}
${AWK} -f awk.Version ${RDIR}.files.AUNMap > ${RESD}.files.AUNMap
${CP} ${RDIR}.files.Hosts ${RESD}.files.Hosts ${CPFLAGS}
${CP} ${RDIR}.files.Networks ${RESD}.files.Networks ${CPFLAGS}
${CP} ${RDIR}.files.Protocols ${RESD}.files.Protocols ${CPFLAGS}
${CP} ${RDIR}.files.Services ${RESD}.files.Services ${CPFLAGS}
${AWK} -f awk.Version ${RDIR}.!Boot > ${RESD}.!Boot
${AWK} -f awk.Version ${RDIR}.!Run > ${RESD}.!Run
resources-BareMinUtils: ${BAREMINUTILS}
${MKDIR} ${RESD}
${MKDIR} ${RESD}.bin
${MKDIR} ${RESD}.files
${CP} ${SDIR}.ifconfig.IfConfig ${RESD}.bin.IfConfig ${CPFLAGS}
${CP} ${SDIR}.ping.Ping ${RESD}.bin.Ping ${CPFLAGS}
${CP} ${RDIR}.files.Hosts ${RESD}.files.Hosts ${CPFLAGS}
${CP} ${RDIR}.files.Protocols ${RESD}.files.Protocols ${CPFLAGS}
${CP} ${RDIR}.files.Services ${RESD}.files.Services ${CPFLAGS}
${AWK} -f awk.Version ${RDIR}.!Boot > ${RESD}.!Boot
${SDIR}.arp.ARP: ${SDIR}.arp.c.ARP ${SDIR}.arp.ARP: ${SDIR}.arp.c.ARP
dir ${SDIR}.arp dir ${SDIR}.arp
@amu_machine @amu_machine
......
|================================================================| |================================================================|
| Boot file for !Internet | BOOTVERSION
| | | |
| Copyright (C) Acorn Computers Ltd., 1996 | | Copyright (C) Acorn Computers Ltd., 1996 |
|================================================================| |================================================================|
......
|================================================================| |================================================================|
| Run file for !Internet | RUNVERSION
| | | |
| Copyright (C) Acorn Computers Ltd., 1996 | | Copyright (C) Acorn Computers Ltd., 1996 |
|================================================================| |================================================================|
......
!Internet version 5.41 (03-Oct-03) HELPVERSION
================================== ==================================
This is the Internet resource directory. It stores This is the Internet resource directory. It stores
......
|===============================================================| |===============================================================|
| AUN map file for !Internet | AUNMAPVERSION
| | | |
| This file is used if you are running AUN protocols, but have | | This file is used if you are running AUN protocols, but have |
| enabled the full TCP/IP Protocol Suite. | | enabled the full TCP/IP Protocol Suite. |
......
...@@ -12,49 +12,38 @@ ...@@ -12,49 +12,38 @@
# MIME type RISC OS Hex Extensions... # MIME type RISC OS Hex Extensions...
# #
text/plain Text fff .txt text/plain Text fff .txt
text/html HTML faf .html .htm .iso-html .shtml text/html html FAF .html .htm .iso-html
text/richtext RTF c32 .rtx text/richtext RTF c32 .rtx
text/x-teletext Teletext 112 .ttx
text/x-vcard vCard acf .vcf
text/* Text fff text/* Text fff
image/gif GIF 695 .gif image/gif GIF 695 .gif
image/jpeg JPEG c85 .jpeg .jpg .jfif .jpe .jfi image/jpeg JPEG c85 .jpeg .jpg .jfif .jpe
image/photo-cd PhotoCD be8 .pcd
image/pjpeg JPEG c85 .pjpeg .pjpg image/pjpeg JPEG c85 .pjpeg .pjpg
image/tiff TIFF ff0 .tiff .tif image/tiff TIFF ff0 .tiff .tif
image/xbm XBitMap b61 .xbm image/xbm XBitMap b61 .xbm
image/svg SVG aad .svg image/x-xbitmap XBitMap b61
image/png PNG b60 .png image/x-xpixmap XPM 301 .xpm
image/xpng PNG b60 image/png PNG b60 .png
image/x-png PNG b60
image/x-photo-cd PhotoCD be8 .pcd image/x-photo-cd PhotoCD be8 .pcd
image/x-MS-bmp BMP 69C .bmp image/x-MS-bmp BMP 69C .bmp
image/x-bitmap XBitMap b61 .bm
image/x-ms-bmp BMP 69c .bmp
image/x-xbitmap XBitMap b61 .bm
image/x-xpixmap XPM 301 .xpm
image/x-photo-cd PhotoCD be8 .pcd
image/x-riscos-sprite Sprite ff9 .spr
image/x-xpixmap XPM 301 .xpm
video/mpeg MPEG bf8 .mpeg .mpg .mpv video/mpeg MPEG bf8 .mpeg .mpg .mpv
video/x-mpeg2 MPEG bf8 video/x-mpeg2 MPEG bf8
video/x-msvideo AVI fb2 .avi
video/quicktime AVI fb2 .mov video/quicktime AVI fb2 .mov
video/avi AVI fb2 .avi video/avi AVI fb2 .avi
video/msvideo AVI fb2 .avi
video/x-msvideo AVI fb2 video/x-msvideo AVI fb2
video/acorn-replay ARMovie ae7 .replay .rpl video/acorn-replay ARMovie ae7 .replay .rpl
x-world/x-vrml VRML b29 .wrl x-world/x-vrml VRML b29 .wrl
model/vrml VRML b29 .wrl
model/vrml VRML b29 .wrl
audio/basic WaveForm fb1 .au .snd audio/basic WaveForm fb1 .au .snd
audio/wav WaveForm fb1 .wav audio/wav WaveForm fb1 .wav
audio/x-wav WaveForm fb1 audio/x-wav WaveForm fb1
audio/aiff AIFF fc2 .aifc .aif .aiff audio/aiff AIFF fc2 .aifc .aif .aiff
audio/x-aiff AIFF fc2 audio/x-aiff AIFF fc2
audio/mp3 AMPEG 1ad
audio/mpeg MPEG bf8 .mpa audio/mpeg MPEG bf8 .mpa
audio/x-mpeg MPEG bf8 audio/x-mpeg MPEG bf8
audio/x-pn-realaudio RealAud f88 .ram .rpm .ra audio/x-pn-realaudio RealAud f88 .ram .rpm .ra
...@@ -64,41 +53,24 @@ audio/x-scpls pls aa8 .pls ...@@ -64,41 +53,24 @@ audio/x-scpls pls aa8 .pls
audio/x-mpegurl M3UFile aa7 .m3u audio/x-mpegurl M3UFile aa7 .m3u
audio/* GenSound f96 .voc audio/* GenSound f96 .voc
application/hyperstudio HStudio b44 .stk .stak application/x-tar tar c46 .tar
application/x-tar tar c46 .tar application/x-director Director ae3 .dxr .dcr .dir
application/x-director Director ae3 .dxr .dcr .dir
application/x-dvi DVI ce4 .dvi application/x-dvi DVI ce4 .dvi
application/x-latex latex 2a8 .ltx application/x-latex latex 2a8 .ltx
application/x-tex tex ce5 .tex application/x-tex tex ce5 .tex
application/x-tex tex 2a7 .tex application/x-tex tex 2a7 .tex
application/postscript PoScript ff5 .ps .eps application/postscript PoScript ff5 .ps .eps
application/pdf PDF adf .pdf application/octet-stream Data ffd .z .Z .exe
application/nc-download NCDown f93 .ncd
application/nc-smartcard SCBBlk f94 .scb
application/octet-stream Data ffd .z .Z .exe
application/dvi DVI ce4
application/gzip GZip f89 .gz .gzip .tgz
application/zip Archive ddc .zip .arc .spk .lha .arj .lzh application/zip Archive ddc .zip .arc .spk .lha .arj .lzh
application/compress Archive ddc .Z .z
application/java-vm Java ae4 .class application/java-vm Java ae4 .class
application/msword MSWord ae6 .doc application/msword MSWord ae6 .doc
application/rtf RTF c32 .rtf application/gzip GZip f89 .gz .tgz
application/x-shockwave-flash Flash 188 .swf application/x-shockwave-flash Flash 188 .swf
application/x-chat Chat 17a .chat .cha
application/x-compress Archive ddc
application/x-director Director ae3 .dxr .dcr .dir
application/x-dvi DVI ce4 .dvi
application/x-gzip GZip f89
application/x-latex LaTex 2a8 .ltx
application/x-nschat Chat 17a .nsc
application/x-shockwave-flash Flash 188 .swf
application/x-tar Tar c46 .tar
application/x-tex TeX ce5 .tex .texi .texinfo
application/x-tex TeX 2a7 .tex
application/riscos * * application/riscos * *
multipart/x-mixed-replace Data ffd multipart/x-mixed-replace Data FFD
message/* Text fff message/* Text fff
*/* data ffd */* data ffd
...@@ -23,7 +23,6 @@ CP = copy ...@@ -23,7 +23,6 @@ CP = copy
LD = link LD = link
RM = remove RM = remove
WIPE = -wipe WIPE = -wipe
SQUEEZE = squeeze
DEFINES = -DRISCOS_TWEAK -Dlint DEFINES = -DRISCOS_TWEAK -Dlint
AFLAGS = -depend !Depend -Stamp -quit AFLAGS = -depend !Depend -Stamp -quit
...@@ -53,7 +52,7 @@ DIRS = o._dirs ...@@ -53,7 +52,7 @@ DIRS = o._dirs
COMPONENT = Host COMPONENT = Host
TARGET = bin.Host TARGET = bin.Host
OBJS = o.ns o.host o.res o.dst o.base64 o.getaddrinfo OBJS = o.ns o.host o.res o.dst
# #
# Rule patterns # Rule patterns
...@@ -78,6 +77,5 @@ ${DIRS}: ...@@ -78,6 +77,5 @@ ${DIRS}:
bin.Host: ${OBJS} ${NET5LIBS} ${CLIB} ${DIRS} bin.Host: ${OBJS} ${NET5LIBS} ${CLIB} ${DIRS}
${LD} -o $@ ${OBJS} ${NET5LIBS} ${CLIB} ${LD} -o $@ ${OBJS} ${NET5LIBS} ${CLIB}
${SQUEEZE} $@
# Dynamic dependencies: # Dynamic dependencies:
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
/* Domain Signature Tools functions */ /* DST functions */
/* These functions do nothing */
#include "sys/types.h" #include "sys/types.h"
#define NOTUSED(k) k=k; #define NOTUSED(k) k=k;
typedef struct dst_key { typedef struct dst_key {
...@@ -27,19 +27,23 @@ typedef struct dst_key { ...@@ -27,19 +27,23 @@ typedef struct dst_key {
u_int16_t dk_id; /* identifier of the key */ u_int16_t dk_id; /* identifier of the key */
} DST_KEY; } DST_KEY;
/* extern DST_KEY *dst_dnskey_to_key(const char *in_name, /* KEY record name */
* dst_dnskey_to_public_key const u_char *key, /* KEY RDATA */
* This function converts the contents of a DNS KEY RR into a DST const int len); /* size of input buffer*/
* key structure. extern void dst_init(void);
* Paramters extern int dst_verify_data(const int mode, /* specifies INIT/UPDATE/FINAL/ALL */
* len Length of the RDATA of the KEY RR RDATA DST_KEY *in_key, /* the key to use */
* rdata A pointer to the the KEY RR RDATA. void **context, /* pointer to state structure */
* in_name Key name to be stored in key structure. const u_char *data, /* data to be verified */
* Returns const int len, /* length of input data */
* NULL Failure const u_char *signature,/* buffer containing signature */
* NON-NULL Success. Pointer to key structure. const int sig_len); /* length of signature */
* Caller's responsibility to free() it. extern DST_KEY *dst_free_key(DST_KEY *f_key);
*/ extern int getaddrinfo(char *,int *,void *,void *);
extern void freeaddrinfo(void *);
extern int __dn_skipname (const u_char *a, const u_char *b);
extern int __dn_expand (const u_char *a, const u_char *b, const u_char *c,
char *d, int e);
DST_KEY *dst_dnskey_to_key(const char *in_name, /* KEY record name */ DST_KEY *dst_dnskey_to_key(const char *in_name, /* KEY record name */
const u_char *key, /* KEY RDATA */ const u_char *key, /* KEY RDATA */
...@@ -49,48 +53,13 @@ DST_KEY *dst_dnskey_to_key(const char *in_name, /* KEY record name */ ...@@ -49,48 +53,13 @@ DST_KEY *dst_dnskey_to_key(const char *in_name, /* KEY record name */
(void)in_name; (void)in_name;
(void)key; (void)key;
return NULL; return 0;
} }
/*
* dst_init
* This function initializes the Digital Signature Toolkit.
* Right now, it just checks the DSTKEYPATH environment variable.
* Parameters
* none
* Returns
* none
*/
void dst_init() void dst_init()
{ {
} }
/*
* dst_verify_data
* An incremental verify function. Data is verified in steps.
* First the context must be initialized (SIG_MODE_INIT).
* Then data is hashed (SIG_MODE_UPDATE). Finally the signature
* is verified (SIG_MODE_FINAL). This function can be called
* once with INIT, UPDATE and FINAL modes all set, or it can be
* called separately with a different mode set for each step. The
* UPDATE step can be repeated.
* Parameters
* mode Operations to perform this time.
* SIG_MODE_INIT 1 Initialize digest
* SIG_MODE_UPDATE 2 add data to digest
* SIG_MODE_FINAL 4 verify signature
* SIG_MODE_ALL
* (SIG_MODE_INIT,SIG_MODE_UPDATE,SIG_MODE_FINAL)
* data Data to pass through the hash function.
* len Length of the data in bytes.
* in_key Key for verification.
* signature Location of signature.
* sig_len Length of the signature in bytes.
* Returns
* 0 Verify success
* Non-Zero Verify Failure
*/
int dst_verify_data(const int mode, /* specifies INIT/UPDATE/FINAL/ALL */ int dst_verify_data(const int mode, /* specifies INIT/UPDATE/FINAL/ALL */
DST_KEY *in_key, /* the key to use */ DST_KEY *in_key, /* the key to use */
void **context, /* pointer to state structure */ void **context, /* pointer to state structure */
...@@ -99,28 +68,30 @@ int dst_verify_data(const int mode, /* specifies INIT/UPDATE/FINAL/ALL */ ...@@ -99,28 +68,30 @@ int dst_verify_data(const int mode, /* specifies INIT/UPDATE/FINAL/ALL */
const u_char *signature,/* buffer containing signature */ const u_char *signature,/* buffer containing signature */
const int sig_len) const int sig_len)
{ {
NOTUSED(in_key) return 0;
NOTUSED(context) }
(void)data;
(void)len;
(void)signature;
(void)sig_len;
(void)mode;
return -1; DST_KEY *dst_free_key(DST_KEY *f_key)
{
return 0;
} }
/* int getaddrinfo(char *a,int *b,void *c,void *d)
* dst_free_key {
* Release all data structures pointed to by a key structure. return 0;
* Parameters }
* f_key Key structure to be freed.
*/
DST_KEY *dst_free_key(DST_KEY *f_key) void freeaddrinfo(void *a)
{ {
NOTUSED(f_key) }
return (NULL); int __dn_skipname (const u_char *a, const u_char *b)
{
return 0;
} }
int __dn_expand (const u_char *a, const u_char *b, const u_char *c,
char *d, int e)
{
return 0;
}
...@@ -127,7 +127,7 @@ static const char copyright[] = ...@@ -127,7 +127,7 @@ static const char copyright[] =
#define NUMMX 50 #define NUMMX 50
#ifdef RISCOS_TWEAK #ifdef RISCOS_TWEAK
/* rrstruct gives a whopper MY_PACKETSZ * NUMRR */ /* rrstruct gives a whopper MY_PACKETSZ * NUMRR */
#define NUMRR 15 /* max rr's per node to verify signatures for */ #define NUMRR 31 /* max rr's per node to verify signatures for */
#else #else
#define NUMRR 127 /* max rr's per node to verify signatures for */ #define NUMRR 127 /* max rr's per node to verify signatures for */
#endif #endif
...@@ -143,7 +143,7 @@ static const char copyright[] = ...@@ -143,7 +143,7 @@ static const char copyright[] =
#ifdef RISCOS_TWEAK #ifdef RISCOS_TWEAK
/* rrstruct gives a whopper MY_PACKETSZ * NUMRR */ /* rrstruct gives a whopper MY_PACKETSZ * NUMRR */
#define MY_PACKETSZ 8*1024 /* need this to hold tcp answers */ #define MY_PACKETSZ 4*1024 /* need this to hold tcp answers */
#else #else
/* rrstruct gives a whopper MY_PACKETSZ * NUMRR */ /* rrstruct gives a whopper MY_PACKETSZ * NUMRR */
#define MY_PACKETSZ 64*1024 /* need this to hold tcp answers */ #define MY_PACKETSZ 64*1024 /* need this to hold tcp answers */
......
...@@ -12,524 +12,65 @@ ...@@ -12,524 +12,65 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
/* Name server related functions required by Host */ /* Name server related functions required by host */
#include "sys/types.h" #include "sys/types.h"
#include "sys/param.h"
#include "sys/socket.h"
#include "netinet/in.h" #define NOTUSED(k) k=k;
#include "arpa/inet.h"
#include "arpa/nameser.h"
#include "ctype.h" extern u_int ns_get16(const u_char *);
#include "netdb.h" extern u_long ns_get32(const u_char *);
#include <stdio.h> extern void ns_put16(u_int,u_char *);
#include <stdlib.h> extern int ns_name_unpack(const u_char *,const u_char *,const u_char *, u_char *, size_t);
#include <string.h> extern int ns_name_ntol(const u_char *, u_char *, size_t);
#include "unistd.h" extern int ns_samename (const char *, const char *);
extern void ns_put16(u_int,u_char *);
extern int __b64_ntop (u_char const *, size_t, char *, size_t);
#include "memory.h" int __b64_ntop (u_char const * a, size_t b, char * c, size_t d)
#include "sys/errno.h"
#include "sys/stat.h"
#include "dst.h"
#include "resolv.h"
#include "port_after.h"
/*
* Inline versions of get/put short/long. Pointer is advanced.
*/
#define NS_GET16(s, cp) { \
register u_char *t_cp = (u_char *)(cp); \
(s) = ((u_int16_t)t_cp[0] << 8) \
| ((u_int16_t)t_cp[1]) \
; \
(cp) += NS_INT16SZ; \
}
#define NS_GET32(l, cp) { \
register u_char *t_cp = (u_char *)(cp); \
(l) = ((u_int32_t)t_cp[0] << 24) \
| ((u_int32_t)t_cp[1] << 16) \
| ((u_int32_t)t_cp[2] << 8) \
| ((u_int32_t)t_cp[3]) \
; \
(cp) += NS_INT32SZ; \
}