ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Line Endings

This commit is contained in:
Luke Usher 2019-03-26 15:43:34 +00:00
parent 6b6d0edb43
commit ec2ae6e95a
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/devices/EmuNVNet.h
View File

@ -179,11 +179,11 @@ typedef struct _ethernet_header
typedef struct _arp_packet
{
uint16_t hw_type;
uint16_t protocol;
uint8_t h_addr_len;
uint8_t p_addr_len;
uint16_t operation;
uint16_t hw_type;
uint16_t protocol;
uint8_t h_addr_len;
uint8_t p_addr_len;
uint16_t operation;
mac_address h_src;
ip_address p_src;
mac_address h_dst;
@ -191,16 +191,16 @@ typedef struct _arp_packet
} arp_packet;
typedef struct _ip_header {
uint8_t ver_hlen; /* version << 4 | header length >> 2 */
uint8_t type; /* type of service */
uint16_t len; /* total length */
uint16_t id; /* identification */
uint16_t offset; /* fragment offset field */
uint8_t ttl; /* time to live */
uint8_t proto; /* protocol */
uint16_t hdr_csum; /* checksum */
ip_address src; /* source and dest address */
ip_address dst;
uint8_t ver_hlen; /* version << 4 | header length >> 2 */
uint8_t type; /* type of service */
uint16_t len; /* total length */
uint16_t id; /* identification */
uint16_t offset; /* fragment offset field */
uint8_t ttl; /* time to live */
uint8_t proto; /* protocol */
uint16_t hdr_csum; /* checksum */
ip_address src; /* source and dest address */
ip_address dst;
} ip_header;
class NVNetDevice : public PCIDevice {

6
src/gui/ResCxbx.h
View File

@ -356,9 +356,9 @@
#define ID_SETTINGS_CONFIG_LOGGING 40108
#define ID_SYNC_CONFIG_LOGGING 40109
#define ID_LOG 40110
#define ID_SETTINGS_CONFIG_NETWORK 40111
#define IDC_NETWORK_ADAPTER 1276
#define IDD_NETWORK_CFG 40112
#define ID_SETTINGS_CONFIG_NETWORK 40111
#define IDC_NETWORK_ADAPTER 1276
#define IDD_NETWORK_CFG 40112
#define IDC_STATIC -1
// Next default values for new objects