Page MenuHomeFreeBSD
Differential D39304

devel/py-pyinstaller: update to 5.8.0
AbandonedPublic
Actions

Authored by arrowd on Mar 29 2023, 4:01 AM.
Tags
None
Referenced Files
F114710381: D39304.id128207.diff
Tue, Apr 15, 6:41 PM
F114647636: D39304.diff
Mon, Apr 14, 9:04 PM
Unknown Object (File)
Wed, Apr 9, 6:25 PM
Unknown Object (File)
Tue, Apr 8, 7:16 PM
Unknown Object (File)
Mon, Apr 7, 3:53 AM
Unknown Object (File)
Sun, Apr 6, 4:29 AM
Unknown Object (File)
Sun, Mar 23, 2:22 AM
Unknown Object (File)
Jan 19 2025, 4:52 PM
View All 63 Files
Subscribers
agh_riseup.net
arrowd
lwhsu
mat

Details

Reviewers
vishwin
hsw_bitmark.com
Group Reviewers
Contributor Reviewers (ports)
Summary

also take maintainership.

Signed-off-by: Christopher Hall <hsw@bitmark.com>

Test Plan

poudriere testport -j 13_1-amd64 devel/py-pyinstaller
poudriere bulk -j 13_1-amd64 devel/py-pyinstaller

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 55363
Build 52252: arc lint + arc unit

Event Timeline

hsw_bitmark.com created this revision.Mar 29 2023, 4:01 AM
Herald added a subscriber: mat. · View Herald TranscriptMar 29 2023, 4:01 AM
hsw_bitmark.com requested review of this revision.Mar 29 2023, 4:01 AM
Harbormaster completed remote builds in B50626: Diff 119573.Mar 29 2023, 4:01 AM
hsw_bitmark.com added a comment.Mar 29 2023, 4:04 AM

The docs building was remove because the latest source on PyPi does not include dock source.
I see that most Python ports do not include docs and did not wat to switch this port to fetch from GitHub

hsw_bitmark.com added a child revision: D39305: [NEW] devel/pyinstaller-hooks-contrib: Community maintained hooks for pyinstaller.Mar 29 2023, 4:10 AM
hsw_bitmark.com added a child revision: D35506: [NEW] devel/awscli2: Universal Command Line Interface for Amazon Web Services V2.Apr 3 2023, 5:13 AM
lwhsu added a subscriber: lwhsu.May 2 2023, 9:24 PM
arrowd added a reviewer: vishwin.May 30 2023, 6:49 AM
hsw_bitmark.com updated this revision to Diff 128207.Oct 4 2023, 9:17 AM

devel/py-pyinstaller: update to 5.12.0

Harbormaster completed remote builds in B53820: Diff 128207.Oct 4 2023, 9:18 AM
arrowd added a subscriber: arrowd.Jan 10 2024, 10:57 AM

This port alone throws

pkg_resources.DistributionNotFound: The 'pyinstaller-hooks-contrib>=2021.4' distribution was not found and is required by pyinstaller

when running just pyinstaller command. It looks like the devel/py-pyinstaller-hooks-contrib port be a dependency of this port, not the other way around?

hsw_bitmark.com updated this revision to Diff 132589.Jan 11 2024, 2:57 AM

pyinstaller need run dependency on its hooks

Harbormaster completed remote builds in B55363: Diff 132589.Jan 11 2024, 2:57 AM
agh_riseup.net added a subscriber: agh_riseup.net.Jan 17 2024, 4:59 AM

There are one too many places for existing bugs, apologies for not checking this platform for an update to py-pysintaller-6.3.0. As a result of https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275494#c38, I started to work on some Ports, py-pyinstaller being the first. I am not too confident on the work I have done, and would appreciate a review.

Cheers.

arrowd commandeered this revision.Feb 1 2024, 9:45 AM
arrowd abandoned this revision.
arrowd added a reviewer: hsw_bitmark.com.

This landed as port of another review.

Revision Contents
Changeset List

Diff 132589

View Options

devel/py-pyinstaller/Makefile

Show All 32 Lines
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL) * @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL)
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/limits.h> #include <sys/limits.h>
#include <sys/endian.h> #include <sys/endian.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <string.h> #include <string.h>
Show All 18 Lines
static char vm_rfc1048[4] = VM_RFC1048; static char vm_rfc1048[4] = VM_RFC1048;
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static char vm_cmu[4] = VM_CMU; static char vm_cmu[4] = VM_CMU;
#endif #endif
/* Local forwards */ /* Local forwards */
static ssize_t bootpsend(struct iodesc *, void *, size_t); static ssize_t bootpsend(struct iodesc *, void *, size_t);
static ssize_t bootprecv(struct iodesc *, void *, size_t, time_t); static ssize_t bootprecv(struct iodesc *, void **, void **, time_t);
static int vend_rfc1048(u_char *, u_int); static int vend_rfc1048(u_char *, u_int);
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static void vend_cmu(u_char *); static void vend_cmu(u_char *);
#endif #endif
#ifdef DHCP_ENV /* export the dhcp response to kenv */ #ifdef DHCP_ENV /* export the dhcp response to kenv */
struct dhcp_opt; struct dhcp_opt;
static void setenv_(u_char *cp, u_char *ep, struct dhcp_opt *opts); static void setenv_(u_char *cp, u_char *ep, struct dhcp_opt *opts);
#else #else
#define setenv_(a, b, c) #define setenv_(a, b, c)
#endif #endif
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
static char expected_dhcpmsgtype = -1, dhcp_ok; static char expected_dhcpmsgtype = -1, dhcp_ok;
struct in_addr dhcp_serverip; struct in_addr dhcp_serverip;
#endif #endif
struct bootp *bootp_response;
size_t bootp_response_size;
/* Fetch required bootp infomation */ /* Fetch required bootp infomation */
void void
bootp(sock, flag) bootp(int sock, int flag)
int sock;
int flag;
{ {
void *pkt;
struct iodesc *d; struct iodesc *d;
struct bootp *bp; struct bootp *bp;
struct { struct {
u_char header[HEADER_SIZE]; u_char header[HEADER_SIZE];
struct bootp wbootp; struct bootp wbootp;
} wbuf; } wbuf;
struct { struct bootp *rbootp;
u_char header[HEADER_SIZE];
struct bootp rbootp;
} rbuf;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootp: socket=%d\n", sock); printf("bootp: socket=%d\n", sock);
#endif #endif
if (!bot) if (!bot)
bot = getsecs(); bot = getsecs();
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Lines
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
expected_dhcpmsgtype = DHCPOFFER; expected_dhcpmsgtype = DHCPOFFER;
dhcp_ok = 0; dhcp_ok = 0;
#endif #endif
if(sendrecv(d, if(sendrecv(d,
bootpsend, bp, sizeof(*bp), bootpsend, bp, sizeof(*bp),
bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp)) bootprecv, &pkt, (void **)&rbootp) == -1) {
== -1) {
printf("bootp: no reply\n"); printf("bootp: no reply\n");
return; return;
} }
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
if(dhcp_ok) { if(dhcp_ok) {
u_int32_t leasetime; u_int32_t leasetime;
bp->bp_vend[6] = DHCPREQUEST; bp->bp_vend[6] = DHCPREQUEST;
bp->bp_vend[7] = TAG_REQ_ADDR; bp->bp_vend[7] = TAG_REQ_ADDR;
bp->bp_vend[8] = 4; bp->bp_vend[8] = 4;
bcopy(&rbuf.rbootp.bp_yiaddr, &bp->bp_vend[9], 4); bcopy(&rbootp->bp_yiaddr, &bp->bp_vend[9], 4);
bp->bp_vend[13] = TAG_SERVERID; bp->bp_vend[13] = TAG_SERVERID;
bp->bp_vend[14] = 4; bp->bp_vend[14] = 4;
bcopy(&dhcp_serverip.s_addr, &bp->bp_vend[15], 4); bcopy(&dhcp_serverip.s_addr, &bp->bp_vend[15], 4);
bp->bp_vend[19] = TAG_LEASETIME; bp->bp_vend[19] = TAG_LEASETIME;
bp->bp_vend[20] = 4; bp->bp_vend[20] = 4;
leasetime = htonl(300); leasetime = htonl(300);
bcopy(&leasetime, &bp->bp_vend[21], 4); bcopy(&leasetime, &bp->bp_vend[21], 4);
if (flag & BOOTP_PXE) { if (flag & BOOTP_PXE) {
bp->bp_vend[25] = TAG_CLASSID; bp->bp_vend[25] = TAG_CLASSID;
bp->bp_vend[26] = 9; bp->bp_vend[26] = 9;
bcopy("PXEClient", &bp->bp_vend[27], 9); bcopy("PXEClient", &bp->bp_vend[27], 9);
bp->bp_vend[36] = TAG_END; bp->bp_vend[36] = TAG_END;
} else } else
bp->bp_vend[25] = TAG_END; bp->bp_vend[25] = TAG_END;
expected_dhcpmsgtype = DHCPACK; expected_dhcpmsgtype = DHCPACK;
free(pkt);
if(sendrecv(d, if(sendrecv(d,
bootpsend, bp, sizeof(*bp), bootpsend, bp, sizeof(*bp),
bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp)) bootprecv, &pkt, (void **)&rbootp) == -1) {
== -1) {
printf("DHCPREQUEST failed\n"); printf("DHCPREQUEST failed\n");
return; return;
} }
} }
#endif #endif
myip = d->myip = rbuf.rbootp.bp_yiaddr; myip = d->myip = rbootp->bp_yiaddr;
servip = rbuf.rbootp.bp_siaddr; servip = rbootp->bp_siaddr;
if(rootip.s_addr == INADDR_ANY) rootip = servip; if (rootip.s_addr == INADDR_ANY)
bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile)); rootip = servip;
bcopy(rbootp->bp_file, bootfile, sizeof(bootfile));
bootfile[sizeof(bootfile) - 1] = '\0'; bootfile[sizeof(bootfile) - 1] = '\0';
if (!netmask) { if (!netmask) {
if (IN_CLASSA(ntohl(myip.s_addr))) if (IN_CLASSA(ntohl(myip.s_addr)))
netmask = htonl(IN_CLASSA_NET); netmask = htonl(IN_CLASSA_NET);
else if (IN_CLASSB(ntohl(myip.s_addr))) else if (IN_CLASSB(ntohl(myip.s_addr)))
netmask = htonl(IN_CLASSB_NET); netmask = htonl(IN_CLASSB_NET);
else else
Show All 23 Lines#ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("gateway ip (%s) bad\n", inet_ntoa(gateip)); printf("gateway ip (%s) bad\n", inet_ntoa(gateip));
#endif #endif
gateip.s_addr = 0; gateip.s_addr = 0;
} }
/* Bump xid so next request will be unique. */ /* Bump xid so next request will be unique. */
++d->xid; ++d->xid;
free(pkt);
} }
/* Transmit a bootp request */ /* Transmit a bootp request */
static ssize_t static ssize_t
bootpsend(d, pkt, len) bootpsend(struct iodesc *d, void *pkt, size_t len)
struct iodesc *d;
void *pkt;
size_t len;
{ {
struct bootp *bp; struct bootp *bp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootpsend: d=%lx called.\n", (long)d); printf("bootpsend: d=%lx called.\n", (long)d);
#endif #endif
bp = pkt; bp = pkt;
bp->bp_secs = htons((u_short)(getsecs() - bot)); bp->bp_secs = htons((u_short)(getsecs() - bot));
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootpsend: calling sendudp\n"); printf("bootpsend: calling sendudp\n");
#endif #endif
return (sendudp(d, pkt, len)); return (sendudp(d, pkt, len));
} }
static ssize_t static ssize_t
bootprecv(d, pkt, len, tleft) bootprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft)
struct iodesc *d;
void *pkt;
size_t len;
time_t tleft;
{ {
ssize_t n; ssize_t n;
struct bootp *bp; struct bootp *bp;
void *ptr;
#ifdef BOOTP_DEBUGx #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootp_recvoffer: called\n"); printf("bootp_recvoffer: called\n");
#endif #endif
n = readudp(d, pkt, len, tleft); ptr = NULL;
n = readudp(d, &ptr, (void **)&bp, tleft);
if (n == -1 || n < sizeof(struct bootp) - BOOTP_VENDSIZE) if (n == -1 || n < sizeof(struct bootp) - BOOTP_VENDSIZE)
goto bad; goto bad;
bp = (struct bootp *)pkt;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootprecv: checked. bp = 0x%lx, n = %d\n", printf("bootprecv: checked. bp = 0x%p, n = %d\n",
(long)bp, (int)n); (void *)bp, (int)n);
ianUnsubmitted
Done
Inline Actions

No need for 0x%p, the %p formatting already puts a 0x on. Also, no need for the (void*) cast of bp to print it.

ian: No need for 0x%p, the %p formatting already puts a 0x on. Also, no need for the (void*) cast…
tsoomeAuthorUnsubmitted
Not Done
Inline Actions

yep, and we have %zd for ssize_t.

tsoome: yep, and we have %zd for ssize_t.
#endif #endif
if (bp->bp_xid != htonl(d->xid)) { if (bp->bp_xid != htonl(d->xid)) {
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) { if (debug) {
printf("bootprecv: expected xid 0x%lx, got 0x%x\n", printf("bootprecv: expected xid 0x%lx, got 0x%x\n",
d->xid, ntohl(bp->bp_xid)); d->xid, ntohl(bp->bp_xid));
} }
#endif #endif
goto bad; goto bad;
} }
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootprecv: got one!\n"); printf("bootprecv: got one!\n");
#endif #endif
/* Suck out vendor info */ /* Suck out vendor info */
if (bcmp(vm_rfc1048, bp->bp_vend, sizeof(vm_rfc1048)) == 0) { if (bcmp(vm_rfc1048, bp->bp_vend, sizeof(vm_rfc1048)) == 0) {
if(vend_rfc1048(bp->bp_vend, sizeof(bp->bp_vend)) != 0) int vsize = n - offsetof(struct bootp, bp_vend);
if (vend_rfc1048(bp->bp_vend, vsize) != 0)
goto bad; goto bad;
/* Save copy of bootp reply or DHCP ACK message */
if (bp->bp_op == BOOTREPLY &&
((dhcp_ok == 1 && expected_dhcpmsgtype == DHCPACK) ||
dhcp_ok == 0)) {
free(bootp_response);
bootp_response = malloc(n);
ianUnsubmitted
Not Done
Inline Actions

Probably should change this free/malloc sequence to a reallocf() call. Then we can optimize libstand realloc() to do nothing if the existing buffer is big enough already (as a separate piece of work from these changes).

ian: Probably should change this free/malloc sequence to a reallocf() call. Then we can optimize…
tsoomeAuthorUnsubmitted
Not Done
Inline Actions

except the libstand does not have reallocf() so this idea has to wait:)

tsoome: except the libstand does not have reallocf() so this idea has to wait:)
if (bootp_response != NULL) {
bootp_response_size = n;
bcopy(bp, bootp_response, bootp_response_size);
} }
}
}
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
else if (bcmp(vm_cmu, bp->bp_vend, sizeof(vm_cmu)) == 0) else if (bcmp(vm_cmu, bp->bp_vend, sizeof(vm_cmu)) == 0)
vend_cmu(bp->bp_vend); vend_cmu(bp->bp_vend);
#endif #endif
else else
printf("bootprecv: unknown vendor 0x%lx\n", (long)bp->bp_vend); printf("bootprecv: unknown vendor 0x%lx\n", (long)bp->bp_vend);
*pkt = ptr;
*payload = bp;
return(n); return (n);
bad: bad:
free(ptr);
errno = 0; errno = 0;
return (-1); return (-1);
} }
int int
dhcp_try_rfc1048(u_char *cp, u_int len) dhcp_try_rfc1048(u_char *cp, u_int len)
{ {
expected_dhcpmsgtype = DHCPACK; expected_dhcpmsgtype = DHCPACK;
if (bcmp(vm_rfc1048, cp, sizeof(vm_rfc1048)) == 0) { if (bcmp(vm_rfc1048, cp, sizeof(vm_rfc1048)) == 0) {
return (vend_rfc1048(cp, len)); return (vend_rfc1048(cp, len));
} }
return (-1); return (-1);
} }
static int static int
vend_rfc1048(cp, len) vend_rfc1048(u_char *cp, u_int len)
u_char *cp;
u_int len;
{ {
u_char *ep; u_char *ep;
int size; int size;
u_char tag; u_char tag;
const char *val; const char *val;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#endif #endif
cp += size; cp += size;
} }
return(0); return(0);
} }
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static void static void
vend_cmu(cp) vend_cmu(u_char *cp)
u_char *cp;
{ {
struct cmu_vend *vp; struct cmu_vend *vp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("vend_cmu bootp info.\n"); printf("vend_cmu bootp info.\n");
#endif #endif
vp = (struct cmu_vend *)cp; vp = (struct cmu_vend *)cp;
▲ Show 20 Lines • Show All 326 Lines • Show Last 20 Lines
View Options

devel/py-pyinstaller/distinfo

Show All 32 Lines
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL) * @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL)
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/limits.h> #include <sys/limits.h>
#include <sys/endian.h> #include <sys/endian.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <string.h> #include <string.h>
Show All 18 Lines
static char vm_rfc1048[4] = VM_RFC1048; static char vm_rfc1048[4] = VM_RFC1048;
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static char vm_cmu[4] = VM_CMU; static char vm_cmu[4] = VM_CMU;
#endif #endif
/* Local forwards */ /* Local forwards */
static ssize_t bootpsend(struct iodesc *, void *, size_t); static ssize_t bootpsend(struct iodesc *, void *, size_t);
static ssize_t bootprecv(struct iodesc *, void *, size_t, time_t); static ssize_t bootprecv(struct iodesc *, void **, void **, time_t);
static int vend_rfc1048(u_char *, u_int); static int vend_rfc1048(u_char *, u_int);
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static void vend_cmu(u_char *); static void vend_cmu(u_char *);
#endif #endif
#ifdef DHCP_ENV /* export the dhcp response to kenv */ #ifdef DHCP_ENV /* export the dhcp response to kenv */
struct dhcp_opt; struct dhcp_opt;
static void setenv_(u_char *cp, u_char *ep, struct dhcp_opt *opts); static void setenv_(u_char *cp, u_char *ep, struct dhcp_opt *opts);
#else #else
#define setenv_(a, b, c) #define setenv_(a, b, c)
#endif #endif
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
static char expected_dhcpmsgtype = -1, dhcp_ok; static char expected_dhcpmsgtype = -1, dhcp_ok;
struct in_addr dhcp_serverip; struct in_addr dhcp_serverip;
#endif #endif
struct bootp *bootp_response;
size_t bootp_response_size;
/* Fetch required bootp infomation */ /* Fetch required bootp infomation */
void void
bootp(sock, flag) bootp(int sock, int flag)
int sock;
int flag;
{ {
void *pkt;
struct iodesc *d; struct iodesc *d;
struct bootp *bp; struct bootp *bp;
struct { struct {
u_char header[HEADER_SIZE]; u_char header[HEADER_SIZE];
struct bootp wbootp; struct bootp wbootp;
} wbuf; } wbuf;
struct { struct bootp *rbootp;
u_char header[HEADER_SIZE];
struct bootp rbootp;
} rbuf;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootp: socket=%d\n", sock); printf("bootp: socket=%d\n", sock);
#endif #endif
if (!bot) if (!bot)
bot = getsecs(); bot = getsecs();
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Lines
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
expected_dhcpmsgtype = DHCPOFFER; expected_dhcpmsgtype = DHCPOFFER;
dhcp_ok = 0; dhcp_ok = 0;
#endif #endif
if(sendrecv(d, if(sendrecv(d,
bootpsend, bp, sizeof(*bp), bootpsend, bp, sizeof(*bp),
bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp)) bootprecv, &pkt, (void **)&rbootp) == -1) {
== -1) {
printf("bootp: no reply\n"); printf("bootp: no reply\n");
return; return;
} }
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
if(dhcp_ok) { if(dhcp_ok) {
u_int32_t leasetime; u_int32_t leasetime;
bp->bp_vend[6] = DHCPREQUEST; bp->bp_vend[6] = DHCPREQUEST;
bp->bp_vend[7] = TAG_REQ_ADDR; bp->bp_vend[7] = TAG_REQ_ADDR;
bp->bp_vend[8] = 4; bp->bp_vend[8] = 4;
bcopy(&rbuf.rbootp.bp_yiaddr, &bp->bp_vend[9], 4); bcopy(&rbootp->bp_yiaddr, &bp->bp_vend[9], 4);
bp->bp_vend[13] = TAG_SERVERID; bp->bp_vend[13] = TAG_SERVERID;
bp->bp_vend[14] = 4; bp->bp_vend[14] = 4;
bcopy(&dhcp_serverip.s_addr, &bp->bp_vend[15], 4); bcopy(&dhcp_serverip.s_addr, &bp->bp_vend[15], 4);
bp->bp_vend[19] = TAG_LEASETIME; bp->bp_vend[19] = TAG_LEASETIME;
bp->bp_vend[20] = 4; bp->bp_vend[20] = 4;
leasetime = htonl(300); leasetime = htonl(300);
bcopy(&leasetime, &bp->bp_vend[21], 4); bcopy(&leasetime, &bp->bp_vend[21], 4);
if (flag & BOOTP_PXE) { if (flag & BOOTP_PXE) {
bp->bp_vend[25] = TAG_CLASSID; bp->bp_vend[25] = TAG_CLASSID;
bp->bp_vend[26] = 9; bp->bp_vend[26] = 9;
bcopy("PXEClient", &bp->bp_vend[27], 9); bcopy("PXEClient", &bp->bp_vend[27], 9);
bp->bp_vend[36] = TAG_END; bp->bp_vend[36] = TAG_END;
} else } else
bp->bp_vend[25] = TAG_END; bp->bp_vend[25] = TAG_END;
expected_dhcpmsgtype = DHCPACK; expected_dhcpmsgtype = DHCPACK;
free(pkt);
if(sendrecv(d, if(sendrecv(d,
bootpsend, bp, sizeof(*bp), bootpsend, bp, sizeof(*bp),
bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp)) bootprecv, &pkt, (void **)&rbootp) == -1) {
== -1) {
printf("DHCPREQUEST failed\n"); printf("DHCPREQUEST failed\n");
return; return;
} }
} }
#endif #endif
myip = d->myip = rbuf.rbootp.bp_yiaddr; myip = d->myip = rbootp->bp_yiaddr;
servip = rbuf.rbootp.bp_siaddr; servip = rbootp->bp_siaddr;
if(rootip.s_addr == INADDR_ANY) rootip = servip; if (rootip.s_addr == INADDR_ANY)
bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile)); rootip = servip;
bcopy(rbootp->bp_file, bootfile, sizeof(bootfile));
bootfile[sizeof(bootfile) - 1] = '\0'; bootfile[sizeof(bootfile) - 1] = '\0';
if (!netmask) { if (!netmask) {
if (IN_CLASSA(ntohl(myip.s_addr))) if (IN_CLASSA(ntohl(myip.s_addr)))
netmask = htonl(IN_CLASSA_NET); netmask = htonl(IN_CLASSA_NET);
else if (IN_CLASSB(ntohl(myip.s_addr))) else if (IN_CLASSB(ntohl(myip.s_addr)))
netmask = htonl(IN_CLASSB_NET); netmask = htonl(IN_CLASSB_NET);
else else
Show All 23 Lines#ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("gateway ip (%s) bad\n", inet_ntoa(gateip)); printf("gateway ip (%s) bad\n", inet_ntoa(gateip));
#endif #endif
gateip.s_addr = 0; gateip.s_addr = 0;
} }
/* Bump xid so next request will be unique. */ /* Bump xid so next request will be unique. */
++d->xid; ++d->xid;
free(pkt);
} }
/* Transmit a bootp request */ /* Transmit a bootp request */
static ssize_t static ssize_t
bootpsend(d, pkt, len) bootpsend(struct iodesc *d, void *pkt, size_t len)
struct iodesc *d;
void *pkt;
size_t len;
{ {
struct bootp *bp; struct bootp *bp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootpsend: d=%lx called.\n", (long)d); printf("bootpsend: d=%lx called.\n", (long)d);
#endif #endif
bp = pkt; bp = pkt;
bp->bp_secs = htons((u_short)(getsecs() - bot)); bp->bp_secs = htons((u_short)(getsecs() - bot));
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootpsend: calling sendudp\n"); printf("bootpsend: calling sendudp\n");
#endif #endif
return (sendudp(d, pkt, len)); return (sendudp(d, pkt, len));
} }
static ssize_t static ssize_t
bootprecv(d, pkt, len, tleft) bootprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft)
struct iodesc *d;
void *pkt;
size_t len;
time_t tleft;
{ {
ssize_t n; ssize_t n;
struct bootp *bp; struct bootp *bp;
void *ptr;
#ifdef BOOTP_DEBUGx #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootp_recvoffer: called\n"); printf("bootp_recvoffer: called\n");
#endif #endif
n = readudp(d, pkt, len, tleft); ptr = NULL;
n = readudp(d, &ptr, (void **)&bp, tleft);
if (n == -1 || n < sizeof(struct bootp) - BOOTP_VENDSIZE) if (n == -1 || n < sizeof(struct bootp) - BOOTP_VENDSIZE)
goto bad; goto bad;
bp = (struct bootp *)pkt;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootprecv: checked. bp = 0x%lx, n = %d\n", printf("bootprecv: checked. bp = 0x%p, n = %d\n",
(long)bp, (int)n); (void *)bp, (int)n);
ianUnsubmitted
Done
Inline Actions

No need for 0x%p, the %p formatting already puts a 0x on. Also, no need for the (void*) cast of bp to print it.

ian: No need for 0x%p, the %p formatting already puts a 0x on. Also, no need for the (void*) cast…
tsoomeAuthorUnsubmitted
Not Done
Inline Actions

yep, and we have %zd for ssize_t.

tsoome: yep, and we have %zd for ssize_t.
#endif #endif
if (bp->bp_xid != htonl(d->xid)) { if (bp->bp_xid != htonl(d->xid)) {
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) { if (debug) {
printf("bootprecv: expected xid 0x%lx, got 0x%x\n", printf("bootprecv: expected xid 0x%lx, got 0x%x\n",
d->xid, ntohl(bp->bp_xid)); d->xid, ntohl(bp->bp_xid));
} }
#endif #endif
goto bad; goto bad;
} }
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootprecv: got one!\n"); printf("bootprecv: got one!\n");
#endif #endif
/* Suck out vendor info */ /* Suck out vendor info */
if (bcmp(vm_rfc1048, bp->bp_vend, sizeof(vm_rfc1048)) == 0) { if (bcmp(vm_rfc1048, bp->bp_vend, sizeof(vm_rfc1048)) == 0) {
if(vend_rfc1048(bp->bp_vend, sizeof(bp->bp_vend)) != 0) int vsize = n - offsetof(struct bootp, bp_vend);
if (vend_rfc1048(bp->bp_vend, vsize) != 0)
goto bad; goto bad;
/* Save copy of bootp reply or DHCP ACK message */
if (bp->bp_op == BOOTREPLY &&
((dhcp_ok == 1 && expected_dhcpmsgtype == DHCPACK) ||
dhcp_ok == 0)) {
free(bootp_response);
bootp_response = malloc(n);
ianUnsubmitted
Not Done
Inline Actions

Probably should change this free/malloc sequence to a reallocf() call. Then we can optimize libstand realloc() to do nothing if the existing buffer is big enough already (as a separate piece of work from these changes).

ian: Probably should change this free/malloc sequence to a reallocf() call. Then we can optimize…
tsoomeAuthorUnsubmitted
Not Done
Inline Actions

except the libstand does not have reallocf() so this idea has to wait:)

tsoome: except the libstand does not have reallocf() so this idea has to wait:)
if (bootp_response != NULL) {
bootp_response_size = n;
bcopy(bp, bootp_response, bootp_response_size);
} }
}
}
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
else if (bcmp(vm_cmu, bp->bp_vend, sizeof(vm_cmu)) == 0) else if (bcmp(vm_cmu, bp->bp_vend, sizeof(vm_cmu)) == 0)
vend_cmu(bp->bp_vend); vend_cmu(bp->bp_vend);
#endif #endif
else else
printf("bootprecv: unknown vendor 0x%lx\n", (long)bp->bp_vend); printf("bootprecv: unknown vendor 0x%lx\n", (long)bp->bp_vend);
*pkt = ptr;
*payload = bp;
return(n); return (n);
bad: bad:
free(ptr);
errno = 0; errno = 0;
return (-1); return (-1);
} }
int int
dhcp_try_rfc1048(u_char *cp, u_int len) dhcp_try_rfc1048(u_char *cp, u_int len)
{ {
expected_dhcpmsgtype = DHCPACK; expected_dhcpmsgtype = DHCPACK;
if (bcmp(vm_rfc1048, cp, sizeof(vm_rfc1048)) == 0) { if (bcmp(vm_rfc1048, cp, sizeof(vm_rfc1048)) == 0) {
return (vend_rfc1048(cp, len)); return (vend_rfc1048(cp, len));
} }
return (-1); return (-1);
} }
static int static int
vend_rfc1048(cp, len) vend_rfc1048(u_char *cp, u_int len)
u_char *cp;
u_int len;
{ {
u_char *ep; u_char *ep;
int size; int size;
u_char tag; u_char tag;
const char *val; const char *val;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#endif #endif
cp += size; cp += size;
} }
return(0); return(0);
} }
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static void static void
vend_cmu(cp) vend_cmu(u_char *cp)
u_char *cp;
{ {
struct cmu_vend *vp; struct cmu_vend *vp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("vend_cmu bootp info.\n"); printf("vend_cmu bootp info.\n");
#endif #endif
vp = (struct cmu_vend *)cp; vp = (struct cmu_vend *)cp;
▲ Show 20 Lines • Show All 326 Lines • Show Last 20 Lines
View Options

devel/py-pyinstaller/files/patch-bootloader_src_main.c

Show All 32 Lines
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL) * @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL)
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/limits.h> #include <sys/limits.h>
#include <sys/endian.h> #include <sys/endian.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <string.h> #include <string.h>
Show All 18 Lines
static char vm_rfc1048[4] = VM_RFC1048; static char vm_rfc1048[4] = VM_RFC1048;
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static char vm_cmu[4] = VM_CMU; static char vm_cmu[4] = VM_CMU;
#endif #endif
/* Local forwards */ /* Local forwards */
static ssize_t bootpsend(struct iodesc *, void *, size_t); static ssize_t bootpsend(struct iodesc *, void *, size_t);
static ssize_t bootprecv(struct iodesc *, void *, size_t, time_t); static ssize_t bootprecv(struct iodesc *, void **, void **, time_t);
static int vend_rfc1048(u_char *, u_int); static int vend_rfc1048(u_char *, u_int);
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static void vend_cmu(u_char *); static void vend_cmu(u_char *);
#endif #endif
#ifdef DHCP_ENV /* export the dhcp response to kenv */ #ifdef DHCP_ENV /* export the dhcp response to kenv */
struct dhcp_opt; struct dhcp_opt;
static void setenv_(u_char *cp, u_char *ep, struct dhcp_opt *opts); static void setenv_(u_char *cp, u_char *ep, struct dhcp_opt *opts);
#else #else
#define setenv_(a, b, c) #define setenv_(a, b, c)
#endif #endif
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
static char expected_dhcpmsgtype = -1, dhcp_ok; static char expected_dhcpmsgtype = -1, dhcp_ok;
struct in_addr dhcp_serverip; struct in_addr dhcp_serverip;
#endif #endif
struct bootp *bootp_response;
size_t bootp_response_size;
/* Fetch required bootp infomation */ /* Fetch required bootp infomation */
void void
bootp(sock, flag) bootp(int sock, int flag)
int sock;
int flag;
{ {
void *pkt;
struct iodesc *d; struct iodesc *d;
struct bootp *bp; struct bootp *bp;
struct { struct {
u_char header[HEADER_SIZE]; u_char header[HEADER_SIZE];
struct bootp wbootp; struct bootp wbootp;
} wbuf; } wbuf;
struct { struct bootp *rbootp;
u_char header[HEADER_SIZE];
struct bootp rbootp;
} rbuf;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootp: socket=%d\n", sock); printf("bootp: socket=%d\n", sock);
#endif #endif
if (!bot) if (!bot)
bot = getsecs(); bot = getsecs();
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Lines
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
expected_dhcpmsgtype = DHCPOFFER; expected_dhcpmsgtype = DHCPOFFER;
dhcp_ok = 0; dhcp_ok = 0;
#endif #endif
if(sendrecv(d, if(sendrecv(d,
bootpsend, bp, sizeof(*bp), bootpsend, bp, sizeof(*bp),
bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp)) bootprecv, &pkt, (void **)&rbootp) == -1) {
== -1) {
printf("bootp: no reply\n"); printf("bootp: no reply\n");
return; return;
} }
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
if(dhcp_ok) { if(dhcp_ok) {
u_int32_t leasetime; u_int32_t leasetime;
bp->bp_vend[6] = DHCPREQUEST; bp->bp_vend[6] = DHCPREQUEST;
bp->bp_vend[7] = TAG_REQ_ADDR; bp->bp_vend[7] = TAG_REQ_ADDR;
bp->bp_vend[8] = 4; bp->bp_vend[8] = 4;
bcopy(&rbuf.rbootp.bp_yiaddr, &bp->bp_vend[9], 4); bcopy(&rbootp->bp_yiaddr, &bp->bp_vend[9], 4);
bp->bp_vend[13] = TAG_SERVERID; bp->bp_vend[13] = TAG_SERVERID;
bp->bp_vend[14] = 4; bp->bp_vend[14] = 4;
bcopy(&dhcp_serverip.s_addr, &bp->bp_vend[15], 4); bcopy(&dhcp_serverip.s_addr, &bp->bp_vend[15], 4);
bp->bp_vend[19] = TAG_LEASETIME; bp->bp_vend[19] = TAG_LEASETIME;
bp->bp_vend[20] = 4; bp->bp_vend[20] = 4;
leasetime = htonl(300); leasetime = htonl(300);
bcopy(&leasetime, &bp->bp_vend[21], 4); bcopy(&leasetime, &bp->bp_vend[21], 4);
if (flag & BOOTP_PXE) { if (flag & BOOTP_PXE) {
bp->bp_vend[25] = TAG_CLASSID; bp->bp_vend[25] = TAG_CLASSID;
bp->bp_vend[26] = 9; bp->bp_vend[26] = 9;
bcopy("PXEClient", &bp->bp_vend[27], 9); bcopy("PXEClient", &bp->bp_vend[27], 9);
bp->bp_vend[36] = TAG_END; bp->bp_vend[36] = TAG_END;
} else } else
bp->bp_vend[25] = TAG_END; bp->bp_vend[25] = TAG_END;
expected_dhcpmsgtype = DHCPACK; expected_dhcpmsgtype = DHCPACK;
free(pkt);
if(sendrecv(d, if(sendrecv(d,
bootpsend, bp, sizeof(*bp), bootpsend, bp, sizeof(*bp),
bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp)) bootprecv, &pkt, (void **)&rbootp) == -1) {
== -1) {
printf("DHCPREQUEST failed\n"); printf("DHCPREQUEST failed\n");
return; return;
} }
} }
#endif #endif
myip = d->myip = rbuf.rbootp.bp_yiaddr; myip = d->myip = rbootp->bp_yiaddr;
servip = rbuf.rbootp.bp_siaddr; servip = rbootp->bp_siaddr;
if(rootip.s_addr == INADDR_ANY) rootip = servip; if (rootip.s_addr == INADDR_ANY)
bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile)); rootip = servip;
bcopy(rbootp->bp_file, bootfile, sizeof(bootfile));
bootfile[sizeof(bootfile) - 1] = '\0'; bootfile[sizeof(bootfile) - 1] = '\0';
if (!netmask) { if (!netmask) {
if (IN_CLASSA(ntohl(myip.s_addr))) if (IN_CLASSA(ntohl(myip.s_addr)))
netmask = htonl(IN_CLASSA_NET); netmask = htonl(IN_CLASSA_NET);
else if (IN_CLASSB(ntohl(myip.s_addr))) else if (IN_CLASSB(ntohl(myip.s_addr)))
netmask = htonl(IN_CLASSB_NET); netmask = htonl(IN_CLASSB_NET);
else else
Show All 23 Lines#ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("gateway ip (%s) bad\n", inet_ntoa(gateip)); printf("gateway ip (%s) bad\n", inet_ntoa(gateip));
#endif #endif
gateip.s_addr = 0; gateip.s_addr = 0;
} }
/* Bump xid so next request will be unique. */ /* Bump xid so next request will be unique. */
++d->xid; ++d->xid;
free(pkt);
} }
/* Transmit a bootp request */ /* Transmit a bootp request */
static ssize_t static ssize_t
bootpsend(d, pkt, len) bootpsend(struct iodesc *d, void *pkt, size_t len)
struct iodesc *d;
void *pkt;
size_t len;
{ {
struct bootp *bp; struct bootp *bp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootpsend: d=%lx called.\n", (long)d); printf("bootpsend: d=%lx called.\n", (long)d);
#endif #endif
bp = pkt; bp = pkt;
bp->bp_secs = htons((u_short)(getsecs() - bot)); bp->bp_secs = htons((u_short)(getsecs() - bot));
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootpsend: calling sendudp\n"); printf("bootpsend: calling sendudp\n");
#endif #endif
return (sendudp(d, pkt, len)); return (sendudp(d, pkt, len));
} }
static ssize_t static ssize_t
bootprecv(d, pkt, len, tleft) bootprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft)
struct iodesc *d;
void *pkt;
size_t len;
time_t tleft;
{ {
ssize_t n; ssize_t n;
struct bootp *bp; struct bootp *bp;
void *ptr;
#ifdef BOOTP_DEBUGx #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootp_recvoffer: called\n"); printf("bootp_recvoffer: called\n");
#endif #endif
n = readudp(d, pkt, len, tleft); ptr = NULL;
n = readudp(d, &ptr, (void **)&bp, tleft);
if (n == -1 || n < sizeof(struct bootp) - BOOTP_VENDSIZE) if (n == -1 || n < sizeof(struct bootp) - BOOTP_VENDSIZE)
goto bad; goto bad;
bp = (struct bootp *)pkt;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootprecv: checked. bp = 0x%lx, n = %d\n", printf("bootprecv: checked. bp = 0x%p, n = %d\n",
(long)bp, (int)n); (void *)bp, (int)n);
ianUnsubmitted
Done
Inline Actions

No need for 0x%p, the %p formatting already puts a 0x on. Also, no need for the (void*) cast of bp to print it.

ian: No need for 0x%p, the %p formatting already puts a 0x on. Also, no need for the (void*) cast…
tsoomeAuthorUnsubmitted
Not Done
Inline Actions

yep, and we have %zd for ssize_t.

tsoome: yep, and we have %zd for ssize_t.
#endif #endif
if (bp->bp_xid != htonl(d->xid)) { if (bp->bp_xid != htonl(d->xid)) {
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) { if (debug) {
printf("bootprecv: expected xid 0x%lx, got 0x%x\n", printf("bootprecv: expected xid 0x%lx, got 0x%x\n",
d->xid, ntohl(bp->bp_xid)); d->xid, ntohl(bp->bp_xid));
} }
#endif #endif
goto bad; goto bad;
} }
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootprecv: got one!\n"); printf("bootprecv: got one!\n");
#endif #endif
/* Suck out vendor info */ /* Suck out vendor info */
if (bcmp(vm_rfc1048, bp->bp_vend, sizeof(vm_rfc1048)) == 0) { if (bcmp(vm_rfc1048, bp->bp_vend, sizeof(vm_rfc1048)) == 0) {
if(vend_rfc1048(bp->bp_vend, sizeof(bp->bp_vend)) != 0) int vsize = n - offsetof(struct bootp, bp_vend);
if (vend_rfc1048(bp->bp_vend, vsize) != 0)
goto bad; goto bad;
/* Save copy of bootp reply or DHCP ACK message */
if (bp->bp_op == BOOTREPLY &&
((dhcp_ok == 1 && expected_dhcpmsgtype == DHCPACK) ||
dhcp_ok == 0)) {
free(bootp_response);
bootp_response = malloc(n);
ianUnsubmitted
Not Done
Inline Actions

Probably should change this free/malloc sequence to a reallocf() call. Then we can optimize libstand realloc() to do nothing if the existing buffer is big enough already (as a separate piece of work from these changes).

ian: Probably should change this free/malloc sequence to a reallocf() call. Then we can optimize…
tsoomeAuthorUnsubmitted
Not Done
Inline Actions

except the libstand does not have reallocf() so this idea has to wait:)

tsoome: except the libstand does not have reallocf() so this idea has to wait:)
if (bootp_response != NULL) {
bootp_response_size = n;
bcopy(bp, bootp_response, bootp_response_size);
} }
}
}
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
else if (bcmp(vm_cmu, bp->bp_vend, sizeof(vm_cmu)) == 0) else if (bcmp(vm_cmu, bp->bp_vend, sizeof(vm_cmu)) == 0)
vend_cmu(bp->bp_vend); vend_cmu(bp->bp_vend);
#endif #endif
else else
printf("bootprecv: unknown vendor 0x%lx\n", (long)bp->bp_vend); printf("bootprecv: unknown vendor 0x%lx\n", (long)bp->bp_vend);
*pkt = ptr;
*payload = bp;
return(n); return (n);
bad: bad:
free(ptr);
errno = 0; errno = 0;
return (-1); return (-1);
} }
int int
dhcp_try_rfc1048(u_char *cp, u_int len) dhcp_try_rfc1048(u_char *cp, u_int len)
{ {
expected_dhcpmsgtype = DHCPACK; expected_dhcpmsgtype = DHCPACK;
if (bcmp(vm_rfc1048, cp, sizeof(vm_rfc1048)) == 0) { if (bcmp(vm_rfc1048, cp, sizeof(vm_rfc1048)) == 0) {
return (vend_rfc1048(cp, len)); return (vend_rfc1048(cp, len));
} }
return (-1); return (-1);
} }
static int static int
vend_rfc1048(cp, len) vend_rfc1048(u_char *cp, u_int len)
u_char *cp;
u_int len;
{ {
u_char *ep; u_char *ep;
int size; int size;
u_char tag; u_char tag;
const char *val; const char *val;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#endif #endif
cp += size; cp += size;
} }
return(0); return(0);
} }
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static void static void
vend_cmu(cp) vend_cmu(u_char *cp)
u_char *cp;
{ {
struct cmu_vend *vp; struct cmu_vend *vp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("vend_cmu bootp info.\n"); printf("vend_cmu bootp info.\n");
#endif #endif
vp = (struct cmu_vend *)cp; vp = (struct cmu_vend *)cp;
▲ Show 20 Lines • Show All 326 Lines • Show Last 20 Lines
View Options

devel/py-pyinstaller/files/patch-bootloader_wscript

Show All 32 Lines
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL) * @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL)
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/limits.h> #include <sys/limits.h>
#include <sys/endian.h> #include <sys/endian.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <string.h> #include <string.h>
Show All 18 Lines
static char vm_rfc1048[4] = VM_RFC1048; static char vm_rfc1048[4] = VM_RFC1048;
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static char vm_cmu[4] = VM_CMU; static char vm_cmu[4] = VM_CMU;
#endif #endif
/* Local forwards */ /* Local forwards */
static ssize_t bootpsend(struct iodesc *, void *, size_t); static ssize_t bootpsend(struct iodesc *, void *, size_t);
static ssize_t bootprecv(struct iodesc *, void *, size_t, time_t); static ssize_t bootprecv(struct iodesc *, void **, void **, time_t);
static int vend_rfc1048(u_char *, u_int); static int vend_rfc1048(u_char *, u_int);
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static void vend_cmu(u_char *); static void vend_cmu(u_char *);
#endif #endif
#ifdef DHCP_ENV /* export the dhcp response to kenv */ #ifdef DHCP_ENV /* export the dhcp response to kenv */
struct dhcp_opt; struct dhcp_opt;
static void setenv_(u_char *cp, u_char *ep, struct dhcp_opt *opts); static void setenv_(u_char *cp, u_char *ep, struct dhcp_opt *opts);
#else #else
#define setenv_(a, b, c) #define setenv_(a, b, c)
#endif #endif
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
static char expected_dhcpmsgtype = -1, dhcp_ok; static char expected_dhcpmsgtype = -1, dhcp_ok;
struct in_addr dhcp_serverip; struct in_addr dhcp_serverip;
#endif #endif
struct bootp *bootp_response;
size_t bootp_response_size;
/* Fetch required bootp infomation */ /* Fetch required bootp infomation */
void void
bootp(sock, flag) bootp(int sock, int flag)
int sock;
int flag;
{ {
void *pkt;
struct iodesc *d; struct iodesc *d;
struct bootp *bp; struct bootp *bp;
struct { struct {
u_char header[HEADER_SIZE]; u_char header[HEADER_SIZE];
struct bootp wbootp; struct bootp wbootp;
} wbuf; } wbuf;
struct { struct bootp *rbootp;
u_char header[HEADER_SIZE];
struct bootp rbootp;
} rbuf;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootp: socket=%d\n", sock); printf("bootp: socket=%d\n", sock);
#endif #endif
if (!bot) if (!bot)
bot = getsecs(); bot = getsecs();
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Lines
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
expected_dhcpmsgtype = DHCPOFFER; expected_dhcpmsgtype = DHCPOFFER;
dhcp_ok = 0; dhcp_ok = 0;
#endif #endif
if(sendrecv(d, if(sendrecv(d,
bootpsend, bp, sizeof(*bp), bootpsend, bp, sizeof(*bp),
bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp)) bootprecv, &pkt, (void **)&rbootp) == -1) {
== -1) {
printf("bootp: no reply\n"); printf("bootp: no reply\n");
return; return;
} }
#ifdef SUPPORT_DHCP #ifdef SUPPORT_DHCP
if(dhcp_ok) { if(dhcp_ok) {
u_int32_t leasetime; u_int32_t leasetime;
bp->bp_vend[6] = DHCPREQUEST; bp->bp_vend[6] = DHCPREQUEST;
bp->bp_vend[7] = TAG_REQ_ADDR; bp->bp_vend[7] = TAG_REQ_ADDR;
bp->bp_vend[8] = 4; bp->bp_vend[8] = 4;
bcopy(&rbuf.rbootp.bp_yiaddr, &bp->bp_vend[9], 4); bcopy(&rbootp->bp_yiaddr, &bp->bp_vend[9], 4);
bp->bp_vend[13] = TAG_SERVERID; bp->bp_vend[13] = TAG_SERVERID;
bp->bp_vend[14] = 4; bp->bp_vend[14] = 4;
bcopy(&dhcp_serverip.s_addr, &bp->bp_vend[15], 4); bcopy(&dhcp_serverip.s_addr, &bp->bp_vend[15], 4);
bp->bp_vend[19] = TAG_LEASETIME; bp->bp_vend[19] = TAG_LEASETIME;
bp->bp_vend[20] = 4; bp->bp_vend[20] = 4;
leasetime = htonl(300); leasetime = htonl(300);
bcopy(&leasetime, &bp->bp_vend[21], 4); bcopy(&leasetime, &bp->bp_vend[21], 4);
if (flag & BOOTP_PXE) { if (flag & BOOTP_PXE) {
bp->bp_vend[25] = TAG_CLASSID; bp->bp_vend[25] = TAG_CLASSID;
bp->bp_vend[26] = 9; bp->bp_vend[26] = 9;
bcopy("PXEClient", &bp->bp_vend[27], 9); bcopy("PXEClient", &bp->bp_vend[27], 9);
bp->bp_vend[36] = TAG_END; bp->bp_vend[36] = TAG_END;
} else } else
bp->bp_vend[25] = TAG_END; bp->bp_vend[25] = TAG_END;
expected_dhcpmsgtype = DHCPACK; expected_dhcpmsgtype = DHCPACK;
free(pkt);
if(sendrecv(d, if(sendrecv(d,
bootpsend, bp, sizeof(*bp), bootpsend, bp, sizeof(*bp),
bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp)) bootprecv, &pkt, (void **)&rbootp) == -1) {
== -1) {
printf("DHCPREQUEST failed\n"); printf("DHCPREQUEST failed\n");
return; return;
} }
} }
#endif #endif
myip = d->myip = rbuf.rbootp.bp_yiaddr; myip = d->myip = rbootp->bp_yiaddr;
servip = rbuf.rbootp.bp_siaddr; servip = rbootp->bp_siaddr;
if(rootip.s_addr == INADDR_ANY) rootip = servip; if (rootip.s_addr == INADDR_ANY)
bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile)); rootip = servip;
bcopy(rbootp->bp_file, bootfile, sizeof(bootfile));
bootfile[sizeof(bootfile) - 1] = '\0'; bootfile[sizeof(bootfile) - 1] = '\0';
if (!netmask) { if (!netmask) {
if (IN_CLASSA(ntohl(myip.s_addr))) if (IN_CLASSA(ntohl(myip.s_addr)))
netmask = htonl(IN_CLASSA_NET); netmask = htonl(IN_CLASSA_NET);
else if (IN_CLASSB(ntohl(myip.s_addr))) else if (IN_CLASSB(ntohl(myip.s_addr)))
netmask = htonl(IN_CLASSB_NET); netmask = htonl(IN_CLASSB_NET);
else else
Show All 23 Lines#ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("gateway ip (%s) bad\n", inet_ntoa(gateip)); printf("gateway ip (%s) bad\n", inet_ntoa(gateip));
#endif #endif
gateip.s_addr = 0; gateip.s_addr = 0;
} }
/* Bump xid so next request will be unique. */ /* Bump xid so next request will be unique. */
++d->xid; ++d->xid;
free(pkt);
} }
/* Transmit a bootp request */ /* Transmit a bootp request */
static ssize_t static ssize_t
bootpsend(d, pkt, len) bootpsend(struct iodesc *d, void *pkt, size_t len)
struct iodesc *d;
void *pkt;
size_t len;
{ {
struct bootp *bp; struct bootp *bp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootpsend: d=%lx called.\n", (long)d); printf("bootpsend: d=%lx called.\n", (long)d);
#endif #endif
bp = pkt; bp = pkt;
bp->bp_secs = htons((u_short)(getsecs() - bot)); bp->bp_secs = htons((u_short)(getsecs() - bot));
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootpsend: calling sendudp\n"); printf("bootpsend: calling sendudp\n");
#endif #endif
return (sendudp(d, pkt, len)); return (sendudp(d, pkt, len));
} }
static ssize_t static ssize_t
bootprecv(d, pkt, len, tleft) bootprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft)
struct iodesc *d;
void *pkt;
size_t len;
time_t tleft;
{ {
ssize_t n; ssize_t n;
struct bootp *bp; struct bootp *bp;
void *ptr;
#ifdef BOOTP_DEBUGx #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootp_recvoffer: called\n"); printf("bootp_recvoffer: called\n");
#endif #endif
n = readudp(d, pkt, len, tleft); ptr = NULL;
n = readudp(d, &ptr, (void **)&bp, tleft);
if (n == -1 || n < sizeof(struct bootp) - BOOTP_VENDSIZE) if (n == -1 || n < sizeof(struct bootp) - BOOTP_VENDSIZE)
goto bad; goto bad;
bp = (struct bootp *)pkt;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootprecv: checked. bp = 0x%lx, n = %d\n", printf("bootprecv: checked. bp = 0x%p, n = %d\n",
(long)bp, (int)n); (void *)bp, (int)n);
ianUnsubmitted
Done
Inline Actions

No need for 0x%p, the %p formatting already puts a 0x on. Also, no need for the (void*) cast of bp to print it.

ian: No need for 0x%p, the %p formatting already puts a 0x on. Also, no need for the (void*) cast…
tsoomeAuthorUnsubmitted
Not Done
Inline Actions

yep, and we have %zd for ssize_t.

tsoome: yep, and we have %zd for ssize_t.
#endif #endif
if (bp->bp_xid != htonl(d->xid)) { if (bp->bp_xid != htonl(d->xid)) {
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) { if (debug) {
printf("bootprecv: expected xid 0x%lx, got 0x%x\n", printf("bootprecv: expected xid 0x%lx, got 0x%x\n",
d->xid, ntohl(bp->bp_xid)); d->xid, ntohl(bp->bp_xid));
} }
#endif #endif
goto bad; goto bad;
} }
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootprecv: got one!\n"); printf("bootprecv: got one!\n");
#endif #endif
/* Suck out vendor info */ /* Suck out vendor info */
if (bcmp(vm_rfc1048, bp->bp_vend, sizeof(vm_rfc1048)) == 0) { if (bcmp(vm_rfc1048, bp->bp_vend, sizeof(vm_rfc1048)) == 0) {
if(vend_rfc1048(bp->bp_vend, sizeof(bp->bp_vend)) != 0) int vsize = n - offsetof(struct bootp, bp_vend);
if (vend_rfc1048(bp->bp_vend, vsize) != 0)
goto bad; goto bad;
/* Save copy of bootp reply or DHCP ACK message */
if (bp->bp_op == BOOTREPLY &&
((dhcp_ok == 1 && expected_dhcpmsgtype == DHCPACK) ||
dhcp_ok == 0)) {
free(bootp_response);
bootp_response = malloc(n);
ianUnsubmitted
Not Done
Inline Actions

Probably should change this free/malloc sequence to a reallocf() call. Then we can optimize libstand realloc() to do nothing if the existing buffer is big enough already (as a separate piece of work from these changes).

ian: Probably should change this free/malloc sequence to a reallocf() call. Then we can optimize…
tsoomeAuthorUnsubmitted
Not Done
Inline Actions

except the libstand does not have reallocf() so this idea has to wait:)

tsoome: except the libstand does not have reallocf() so this idea has to wait:)
if (bootp_response != NULL) {
bootp_response_size = n;
bcopy(bp, bootp_response, bootp_response_size);
} }
}
}
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
else if (bcmp(vm_cmu, bp->bp_vend, sizeof(vm_cmu)) == 0) else if (bcmp(vm_cmu, bp->bp_vend, sizeof(vm_cmu)) == 0)
vend_cmu(bp->bp_vend); vend_cmu(bp->bp_vend);
#endif #endif
else else
printf("bootprecv: unknown vendor 0x%lx\n", (long)bp->bp_vend); printf("bootprecv: unknown vendor 0x%lx\n", (long)bp->bp_vend);
*pkt = ptr;
*payload = bp;
return(n); return (n);
bad: bad:
free(ptr);
errno = 0; errno = 0;
return (-1); return (-1);
} }
int int
dhcp_try_rfc1048(u_char *cp, u_int len) dhcp_try_rfc1048(u_char *cp, u_int len)
{ {
expected_dhcpmsgtype = DHCPACK; expected_dhcpmsgtype = DHCPACK;
if (bcmp(vm_rfc1048, cp, sizeof(vm_rfc1048)) == 0) { if (bcmp(vm_rfc1048, cp, sizeof(vm_rfc1048)) == 0) {
return (vend_rfc1048(cp, len)); return (vend_rfc1048(cp, len));
} }
return (-1); return (-1);
} }
static int static int
vend_rfc1048(cp, len) vend_rfc1048(u_char *cp, u_int len)
u_char *cp;
u_int len;
{ {
u_char *ep; u_char *ep;
int size; int size;
u_char tag; u_char tag;
const char *val; const char *val;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#endif #endif
cp += size; cp += size;
} }
return(0); return(0);
} }
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static void static void
vend_cmu(cp) vend_cmu(u_char *cp)
u_char *cp;
{ {
struct cmu_vend *vp; struct cmu_vend *vp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("vend_cmu bootp info.\n"); printf("vend_cmu bootp info.\n");
#endif #endif
vp = (struct cmu_vend *)cp; vp = (struct cmu_vend *)cp;
▲ Show 20 Lines • Show All 326 Lines • Show Last 20 Lines
View Options

devel/py-pyinstaller/files/patch-doc_help2rst.py

Loading...
View Options

devel/py-pyinstaller/pkg-plist

Loading...