search for: pxe_pvt_inod

When attempting to build syslinux in parallel (make -j5), I encountered the following error at the end: rm -f liblpxelinux.a ar cq liblpxelinux.a rawcon.o ./fs/pxe/dhcp_option.o ./fs/pxe/pxe.o ./fs/pxe/tftp.o ./fs/pxe/urlparse.o ./lwip/src/netif/ethernetif.o ./lwip/src/netif/etharp.o ./lwip/src/netif/slipif.o ./lwip/src/netif/ppp/md5.o ./lwip/src/netif/ppp/randm.o ./lwip/src/netif/ppp/chpms.o

Signed-off-by: Julien Viard de Galbert <jviarddegalbert at online.net> --- efi/udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efi/udp.c b/efi/udp.c index 1088f47..b0f13ad 100644 --- a/efi/udp.c +++ b/efi/udp.c @@ -163,7 +163,7 @@ void core_udp_connect(struct pxe_pvt_inode *socket, uint32_t ip, } else { udata.UseDefaultAddress = FALSE; memcpy(&udata.StationAddress, &IPInfo.myip, sizeof(IPInfo.myip)); - memcpy(&udata.StationAddress, &IPInfo.netmask, sizeof(IPInfo.netmask)); + memcpy(&udata.SubnetMask, &IPInfo.netmask, sizeof(IPInfo.ne...

...ggered when multiple TCP connections are opened when using the EFI bootloader. Signed-off-by: Joshua Weage <joshua.weage at dell.com> --- --- master/core/fs/pxe/pxe.h 2017-07-22 14:45:46.561674329 -0500 +++ jw/core/fs/pxe/pxe.h 2017-07-23 19:44:46.466498950 -0500 @@ -144,6 +144,7 @@ struct pxe_pvt_inode { uint8_t tftp_goteof; /* 1 if the EOF packet received */ uint8_t tftp_unused[3]; /* Currently unused */ char *tftp_pktbuf; /* Packet buffer */ + char tcp_databuf[8192]; /* data buffer */ struct inode *ctl; /* Control connection (for...

...ot;%s: udp->Configure() unsuccessful (%d)", f, status); + Print(L"%s: udp->Configure() unsuccessful (%d)\n", f, status); if (!efi_net_def_addr && (status == EFI_INVALID_PARAMETER)) efi_net_def_addr = 2; } @@ -158,6 +158,7 @@ void core_udp_connect(struct pxe_pvt_inode *socket, uint32_t ip, /* Re-use the existing local port number */ udata.StationPort = socket->net.efi.localport; +retry: if (efi_net_def_addr) { udata.UseDefaultAddress = TRUE; } else { @@ -170,6 +171,11 @@ void core_udp_connect(struct pxe_pvt_inode *socket, uint32_t ip,...

Here is a completely untested patch if someone wants to try and take it for a spin? -hpa -------------- next part -------------- diff --git a/efi/udp.c b/efi/udp.c index 59bb426..60a8fe9 100644 --- a/efi/udp.c +++ b/efi/udp.c @@ -41,8 +41,7 @@ int core_udp_open(struct pxe_pvt_inode *socket) udp = (EFI_UDP4 *)udp_reader->this; memset(&udata, 0, sizeof(udata)); - udata.AcceptPromiscuous = TRUE; - udata.AcceptAnyPort = TRUE; + udata.AcceptBroadcast = TRUE; status = uefi_call_wrapper(udp->Configure, 2, udp, &udata); if (status != EF...

I did change both instances of txdata->GatewayAddress, but I think something may be wrong in my toolchain. If I extract syslinux.zip and attempt to make from there (without modifying any files), the cached DHCP packet isn't read on the same subnet. I receive "Succeed to download NBP file." twice before anything from syslinux is loaded, so I believe the duplicate request for

...needed. Resolve bug #35. Signed-off-by: Celelibi <celelibi at gmail.com> --- efi/udp.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/efi/udp.c b/efi/udp.c index 59bb426..7271f1f 100644 --- a/efi/udp.c +++ b/efi/udp.c @@ -336,6 +336,9 @@ void core_udp_sendto(struct pxe_pvt_inode *socket, const void *data, memset(&udata, 0, sizeof(udata)); + /* Re-use the existing local port number if any */ + udata.StationPort = socket->net.efi.localport; + memcpy(&udata.StationAddress, &IPInfo.myip, sizeof(IPInfo.myip)); memcpy(&udata.SubnetMas...

...pper(udp->Configure, 2, udp, NULL)) || + EFI_ERROR (uefi_call_wrapper(udp->Configure, 2, udp, udata)) + ) + return -1; + else + return EFI_SUCCESS; + + } + + else + return -1; + } /** @@ -63,55 +203,76 @@ EFI_STATUS core_udp_configure(EFI_UDP4 * */ int core_udp_open(struct pxe_pvt_inode *socket) { - EFI_UDP4_CONFIG_DATA udata; - struct efi_binding *b; - EFI_STATUS status; - EFI_UDP4 *udp; - + EFI_STATUS status; + struct efi_binding* b; + EFI_UDP4* udp; + UDP_IO* udp_io; + (void)socket; - udp_reader = efi_create_binding(&Udp4ServiceBindingP...

...; + * @param:socket, the open socket White space change > + * @param:ip, the source ip address White space change, plus 'source ' > + * @param:port, the source port number, host-byte order White space change, plus 'source ' > */ > -void core_udp_connect(struct pxe_pvt_inode *socket, uint32_t ip, > - uint16_t port) > +void core_udp_connect(struct pxe_pvt_inode *socket, uint32_t src_ip, > + uint16_t src_port) Changed 'ip' and 'port' in 'src_ip' and 'src_port'. However: 'src_ip' and 'src_port' are...

...packets. It has no associated state unlike - * socket->net.efi.binding, which has a remote IP address and port - * number. - */ -static struct efi_binding *udp_reader; - static int volatile efi_udp_has_recv = 0; int volatile efi_net_def_addr = 1; @@ -76,17 +68,11 @@ int core_udp_open(struct pxe_pvt_inode *socket) EFI_STATUS status; EFI_UDP4 *udp; - (void)socket; - - udp_reader = efi_create_binding(&Udp4ServiceBindingProtocol, &Udp4Protocol); - if (!udp_reader) - return -1; - b = efi_create_binding(&Udp4ServiceBindingProtocol, &Udp4Protocol); if (!b)...

...s a remote IP address and port > + * number. > + */ > +static struct efi_binding *udp_reader; > + > +/** > + * Open a socket > + * > + * @param:socket, the socket to open > + * > + * @out: error code, 0 on success, -1 on failure > + */ > +int core_udp_open(struct pxe_pvt_inode *socket) > +{ > + memset(&udata, 0, sizeof(udata)); > + udata.AcceptPromiscuous = TRUE; > + udata.AcceptAnyPort = TRUE; Why promiscuous? That seems to want to accept it on any local address and put the NIC into promiscuous mode, avoiding the default MAC filter in the NI...

The variable 'ok' is never used and generates a warning. Remove it. Also ntfssect.c is designed to be compiled in non Unicode mode when using MSVC compilers, so remove all ambiguity about it (LPCTSTR -> LPCSTR, use of 'A' API calls) so that it doesn't break when compiled in Unicode mode, which is what Rufus uses with MSVC. -------------- next part --------------

...t; + */ > > +static struct efi_binding *udp_reader; > > + > > +/** > > + * Open a socket > > + * > > + * @param:socket, the socket to open > > + * > > + * @out: error code, 0 on success, -1 on failure > > + */ > > +int core_udp_open(struct pxe_pvt_inode *socket) > > +{ > > > + memset(&udata, 0, sizeof(udata)); > > + udata.AcceptPromiscuous = TRUE; > > + udata.AcceptAnyPort = TRUE; > > Why promiscuous? That seems to want to accept it on any local address > and put the NIC into promiscuous mode, a...

...>> --- >> efi/udp.c | 18 ++++++++++++++++++ >> 1 file changed, 18 insertions(+) >> >> diff --git a/efi/udp.c b/efi/udp.c >> index 59bb426..7271f1f 100644 >> --- a/efi/udp.c >> +++ b/efi/udp.c >> @@ -336,6 +336,9 @@ void core_udp_sendto(struct pxe_pvt_inode *socket, const void *data, >> >> memset(&udata, 0, sizeof(udata)); >> >> + /* Re-use the existing local port number if any */ >> + udata.StationPort = socket->net.efi.localport; >> + > > As HPA noted, this shouldn't be saved here. Co...

...)); + } else { + /*on different subnets*/ + udata.UseDefaultAddress = TRUE; + } + } + memcpy(&udata.RemoteAddress, &ip, sizeof(ip)); udata.RemotePort = port; udata.AcceptPromiscuous = TRUE; @@ -350,6 +374,7 @@ void core_udp_sendto(struct pxe_pvt_inod EFI_STATUS status; struct efi_binding *b; EFI_UDP4 *udp; + uint32_t tip; (void)socket; @@ -372,7 +397,30 @@ void core_udp_sendto(struct pxe_pvt_inod /* Re-use the existing local port number */ udata.StationPort = socket->net.efi.localport; - udata.UseDef...

...&udata.StationAddress, &ip, sizeof(ip)); + ip = IPInfo.netmask; + memcpy(&udata.SubnetMask, &ip, sizeof(ip)); status = core_udp_configure(udp, &udata, L"core_udp_connect"); if (status != EFI_SUCCESS) { @@ -372,11 +376,15 @@ void core_udp_sendto(struct pxe_pvt_inod /* Re-use the existing local port number */ udata.StationPort = socket->net.efi.localport; - udata.UseDefaultAddress = TRUE; + udata.UseDefaultAddress = FALSE; memcpy(&udata.RemoteAddress, &ip, sizeof(ip)); udata.RemotePort = port; udata.AcceptPromiscuous...

...+ >>>> 1 file changed, 18 insertions(+) >>>> >>>> diff --git a/efi/udp.c b/efi/udp.c >>>> index 59bb426..7271f1f 100644 >>>> --- a/efi/udp.c >>>> +++ b/efi/udp.c >>>> @@ -336,6 +336,9 @@ void core_udp_sendto(struct pxe_pvt_inode *socket, >>>> const void *data, >>>> >>>> memset(&udata, 0, sizeof(udata)); >>>> >>>> + /* Re-use the existing local port number if any */ >>>> + udata.StationPort = socket->net.efi.localport; >>>&gt...

...lelibi <celelibi at gmail.com> > --- > efi/udp.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/efi/udp.c b/efi/udp.c > index 59bb426..7271f1f 100644 > --- a/efi/udp.c > +++ b/efi/udp.c > @@ -336,6 +336,9 @@ void core_udp_sendto(struct pxe_pvt_inode *socket, const void *data, > > memset(&udata, 0, sizeof(udata)); > > + /* Re-use the existing local port number if any */ > + udata.StationPort = socket->net.efi.localport; > + As HPA noted, this shouldn't be saved here. Commit 7ec052b on my branch efi-fix...

...udp.c | 18 ++++++++++++++++++ >>> 1 file changed, 18 insertions(+) >>> >>> diff --git a/efi/udp.c b/efi/udp.c >>> index 59bb426..7271f1f 100644 >>> --- a/efi/udp.c >>> +++ b/efi/udp.c >>> @@ -336,6 +336,9 @@ void core_udp_sendto(struct pxe_pvt_inode *socket, >>> const void *data, >>> >>> memset(&udata, 0, sizeof(udata)); >>> >>> + /* Re-use the existing local port number if any */ >>> + udata.StationPort = socket->net.efi.localport; >>> + >> >> As HPA...

.../* string pointer */ - size_t offset; /* offset into socket structre */ -}; struct tftp_packet { uint16_t opcode; uint16_t serial; char data[]; }; -#define IFIELD(x) offsetof(struct inode, x) -#define PFIELD(x) (offsetof(struct inode, pvt) + \ - offsetof(struct pxe_pvt_inode, x)) - -static const struct tftp_options tftp_options[] = -{ - { "tsize", IFIELD(size) }, - { "blksize", PFIELD(tftp_blksize) }, -}; -static const int tftp_nopts = sizeof tftp_options / sizeof tftp_options[0]; - static void tftp_error(struct inode *file, uint16_t errnu...