Subversion Repositories SvarDOS

Compare Revisions

Ignore whitespace Rev 1558 → Rev 1559

/pkgnet/trunk/Makefile
10,7 → 10,6
release: pkgnet.exe .symbolic
mkdir bin
mkdir appinfo
upx --8086 -9 pkgnet.exe
copy pkgnet.exe bin
copy pkgnet.lng bin
copy pkgnet.lsm appinfo
33,6 → 32,7
move /y out.lng ..\pkgnet.lng
cd ..
*wcl -lr -k4096 $(LIB) pkgnet.obj deflang.c net.obj unchunk.obj lsm.obj helpers.obj trim.obj -fe=pkgnet.exe
upx --8086 -9 pkgnet.exe
 
pkgnet.obj: pkgnet.c
*wcc $(CFLAGS) pkgnet.c
/pkgnet/trunk/net.c
34,19 → 34,6
};
 
 
int net_dnsresolve(char *ip, const char *name, int retries) {
unsigned long ipnum;
do {
ipnum = resolve(name); /* I could use WatTCP's lookup_host() to do all the
job for me, unfortunately lookup_host() issues
wild outs() calls putting garbage on screen... */
} while ((ipnum == 0) && (retries-- > 0));
if (ipnum == 0) return(-1);
_inet_ntoa(ip, ipnum); /* convert to string */
return(0);
}
 
 
static int dummy_printf(const char * format, ...) {
if (format == NULL) return(-1);
return(0);
/pkgnet/trunk/pkgnet.c
43,9 → 43,9
#define PVER "20230823"
#define PDATE "2021-2023"
 
#define HOSTADDR "svardos.org"
#define HOSTNAME "svardos.org"
#define HOSTADDR "141.95.149.60"
 
 
/* convenience define that outputs nls strings to screen (followed by CR/LF) */
#define putsnls(x,y) puts(svarlang_strid((x << 8) | y))
 
262,7 → 262,7
 
sock = net_connect(ipaddr, 80, tcpbuflen);
if (sock == NULL) {
printf(svarlang_strid(0x0902), HOSTADDR); /* "ERROR: failed to connect to " HOSTADDR */
printf(svarlang_strid(0x0902), HOSTNAME); /* "ERROR: failed to connect to " HOSTNAME */
puts("");
goto SHITQUIT;
}
272,7 → 272,7
int connstate = net_isconnected(sock);
if (connstate > 0) break;
if (connstate < 0) {
printf(svarlang_strid(0x0902), HOSTADDR); /* "ERROR: failed to connect to " HOSTADDR */
printf(svarlang_strid(0x0902), HOSTNAME); /* "ERROR: failed to connect to " HOSTNAME */
puts("");
goto SHITQUIT;
}
281,9 → 281,9
 
/* socket is connected - send the http request (MUST be HTTP/1.0 because I do not support chunked transfers!) */
if (ispost) {
snprintf((char *)buffer, buffersz, "POST %s HTTP/1.1\r\nHOST: " HOSTADDR "\r\nUSER-AGENT: pkgnet/" PVER "\r\nTransfer-Encoding: chunked\r\nConnection: close\r\n\r\n", url);
snprintf((char *)buffer, buffersz, "POST %s HTTP/1.1\r\nHOST: " HOSTNAME "\r\nUSER-AGENT: pkgnet/" PVER "\r\nTransfer-Encoding: chunked\r\nConnection: close\r\n\r\n", url);
} else {
snprintf((char *)buffer, buffersz, "GET %s HTTP/1.1\r\nHOST: " HOSTADDR "\r\nUSER-AGENT: pkgnet/" PVER "\r\nConnection: close\r\n\r\n", url);
snprintf((char *)buffer, buffersz, "GET %s HTTP/1.1\r\nHOST: " HOSTNAME "\r\nUSER-AGENT: pkgnet/" PVER "\r\nConnection: close\r\n\r\n", url);
}
 
if (net_send(sock, buffer, strlen((char *)buffer)) != (int)strlen((char *)buffer)) {
421,7 → 421,6
 
struct {
unsigned char buffer[5000];
char ipaddr[64];
char url[64];
char outfname[16];
} *mem;
466,12 → 465,7
 
puts(""); /* required because watt-32 likes to print out garbage sometimes ("configuring through DHCP...") */
 
if (net_dnsresolve(mem->ipaddr, HOSTADDR, 2) != 0) {
putsnls(9, 12); /* "ERROR: DNS resolution failed" */
return(1);
}
 
flen = htget(mem->ipaddr, mem->url, mem->outfname, &bsum, ispost, mem->buffer, sizeof(mem->buffer), tcpbufsz);
flen = htget(HOSTADDR, mem->url, mem->outfname, &bsum, ispost, mem->buffer, sizeof(mem->buffer), tcpbufsz);
if (flen < 1) return(1);
 
if (mem->outfname[0] != 0) {