Changes in uspace/srv/net/inetsrv/inetsrv.c [7af0cc5:9749e47] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/inetsrv/inetsrv.c
r7af0cc5 r9749e47 46 46 #include <stdlib.h> 47 47 #include <sys/types.h> 48 #include <net/socket_codes.h>49 48 #include "addrobj.h" 50 49 #include "icmp.h" … … 55 54 #include "inetcfg.h" 56 55 #include "inetping.h" 57 #include "inetping6.h"58 56 #include "inet_link.h" 59 57 #include "reass.h" … … 63 61 64 62 static inet_naddr_t solicited_node_mask = { 65 . family = AF_INET6,63 .version = ip_v6, 66 64 .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff, 0, 0, 0}, 67 65 .prefix = 104 … … 69 67 70 68 static inet_addr_t broadcast4_all_hosts = { 71 . family = AF_INET,69 .version = ip_v4, 72 70 .addr = 0xffffffff 73 71 }; 74 72 75 73 static inet_addr_t multicast_all_nodes = { 76 . family = AF_INET6,74 .version = ip_v6, 77 75 .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01} 78 76 }; … … 112 110 rc = loc_service_register_with_iface(SERVICE_NAME_INETPING, &sid, 113 111 INET_PORT_PING); 114 if (rc != EOK) {115 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);116 return EEXIST;117 }118 119 rc = loc_service_register_with_iface(SERVICE_NAME_INETPING6, &sid,120 INET_PORT_PING6);121 112 if (rc != EOK) { 122 113 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc); … … 180 171 181 172 if (dgram->iplink != 0) { 173 /* XXX TODO - IPv6 */ 182 174 log_msg(LOG_DEFAULT, LVL_DEBUG, "dgram directly to iplink %zu", 183 175 dgram->iplink); … … 187 179 return ENOENT; 188 180 189 if (dgram->src. family != AF_INET||190 dgram->dest. family != AF_INET)181 if (dgram->src.version != ip_v4 || 182 dgram->dest.version != ip_v4) 191 183 return EINVAL; 192 184 … … 225 217 226 218 /* Take source address from the address object */ 227 if (remote->family == AF_INET && remote->addr == 0xffffffff) { 228 local->family = AF_INET; 219 if (remote->version == ip_v4 && remote->addr == 0xffffffff) { 220 /* XXX TODO - IPv6 */ 221 local->version = ip_v4; 229 222 local->addr = 0; 230 223 return EOK; 231 224 } 225 232 226 inet_naddr_addr(&dir.aobj->naddr, local); 233 227 return EOK; … … 450 444 inetping_conn(iid, icall, arg); 451 445 break; 452 case INET_PORT_PING6:453 inetping6_conn(iid, icall, arg);454 break;455 446 default: 456 447 async_answer_0(iid, ENOTSUP);
Note:
See TracChangeset
for help on using the changeset viewer.