Skip to content

Commit a9cfe69

Browse files
committed
network_wii: rename some magic numbers in network code
does nothing, but clears up some numbers
1 parent a62c574 commit a9cfe69

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

libogc/network_wii.c

+14-10
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ distribution.
7272

7373
#define IOCTLV_SO_GETINTERFACEOPT_LEVEL 0x0000FFFE;
7474

75+
//wii doesn't use, or use, sin_zero in sockaddr_in and all communications assumes its not there
76+
//bsd sockets does have it, so we ignore it using this size define
77+
#define WII_SOCKADDR_IN_SIZE offsetof(struct sockaddr_in, sin_addr)
78+
7579
enum {
7680
IOCTL_SO_ACCEPT = 1,
7781
IOCTL_SO_BIND,
@@ -820,12 +824,12 @@ s32 net_bind(s32 s, struct sockaddr *name, socklen_t namelen)
820824
if (net_ip_top_fd < 0) return -ENXIO;
821825
if (name->sa_family != AF_INET) return -EAFNOSUPPORT;
822826

823-
name->sa_len = 8;
827+
name->sa_len = WII_SOCKADDR_IN_SIZE;
824828

825829
memset(params, 0, sizeof(struct bind_params));
826830
params->socket = s;
827831
params->has_name = 1;
828-
memcpy(params->name, name, 8);
832+
memcpy(params->name, name, WII_SOCKADDR_IN_SIZE);
829833

830834
ret = _net_convert_error(IOS_Ioctl(net_ip_top_fd, IOCTL_SO_BIND, params, sizeof (struct bind_params), NULL, 0));
831835
debug_printf("net_bind(%d, %p)=%d\n", s, name, ret);
@@ -860,14 +864,14 @@ s32 net_accept(s32 s, struct sockaddr *addr, socklen_t *addrlen)
860864
if (net_ip_top_fd < 0) return -ENXIO;
861865

862866
if (!addr) return -EINVAL;
863-
addr->sa_len = 8;
867+
addr->sa_len = WII_SOCKADDR_IN_SIZE;
864868
addr->sa_family = AF_INET;
865869

866870
if (!addrlen) return -EINVAL;
867871

868-
if (*addrlen < 8) return -ENOMEM;
872+
if (*addrlen < WII_SOCKADDR_IN_SIZE) return -ENOMEM;
869873

870-
*addrlen = 8;
874+
*addrlen = WII_SOCKADDR_IN_SIZE;
871875

872876
*_socket = s;
873877
debug_printf("calling ios_ioctl(%d, %d, %p, %d)\n", net_ip_top_fd, IOCTL_SO_ACCEPT, _socket, 4);
@@ -884,9 +888,9 @@ s32 net_connect(s32 s, struct sockaddr *addr, socklen_t addrlen)
884888

885889
if (net_ip_top_fd < 0) return -ENXIO;
886890
if (addr->sa_family != AF_INET) return -EAFNOSUPPORT;
887-
if (addrlen < 8) return -EINVAL;
891+
if (addrlen < WII_SOCKADDR_IN_SIZE) return -EINVAL;
888892

889-
addrlen = 8;
893+
addrlen = WII_SOCKADDR_IN_SIZE;
890894

891895
addr->sa_len = addrlen;
892896

@@ -1143,11 +1147,11 @@ s32 net_getsockname(s32 s, struct sockaddr *addr, socklen_t *addrlen)
11431147
if (!addr) return -EINVAL;
11441148
if (!addrlen) return -EINVAL;
11451149

1146-
if (*addrlen < 8) return -ENOMEM;
1150+
if (*addrlen < WII_SOCKADDR_IN_SIZE) return -ENOMEM;
11471151

1148-
addr->sa_len = 8;
1152+
addr->sa_len = WII_SOCKADDR_IN_SIZE;
11491153
addr->sa_family = AF_INET;
1150-
*addrlen = 8;
1154+
*addrlen = WII_SOCKADDR_IN_SIZE;
11511155
*_socket = s;
11521156

11531157
ret = _net_convert_error(IOS_Ioctl(net_ip_top_fd, IOCTL_SO_GETSOCKNAME, _socket, 4, addr, *addrlen));

0 commit comments

Comments
 (0)