Changes in uspace/srv/net/dhcp/dhcp.c [b7155d7:8d58fca] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/dhcp/dhcp.c
rb7155d7 r8d58fca 1 1 /* 2 * Copyright (c) 20 22Jiri Svoboda2 * Copyright (c) 2013 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 42 42 #include <fibril_synch.h> 43 43 #include <inet/addr.h> 44 #include <inet/eth_addr.h>45 44 #include <inet/dnsr.h> 46 45 #include <inet/inetcfg.h> 47 46 #include <io/log.h> 48 47 #include <loc.h> 49 #include <rndgen.h>50 48 #include <stdio.h> 51 49 #include <stdlib.h> … … 96 94 /** DNS server */ 97 95 inet_addr_t dns_server; 98 /** Transaction ID */99 uint32_t xid;100 96 } dhcp_offer_t; 101 97 … … 117 113 /** Last received offer */ 118 114 dhcp_offer_t offer; 119 /** Random number generator */120 rndgen_t *rndgen;121 115 } dhcp_link_t; 122 116 … … 159 153 dhcp_hdr_t *hdr = (dhcp_hdr_t *)msgbuf; 160 154 uint8_t *opt = msgbuf + sizeof(dhcp_hdr_t); 161 uint32_t xid;162 errno_t rc;163 size_t i;164 165 rc = rndgen_uint32(dlink->rndgen, &xid);166 if (rc != EOK)167 return rc;168 155 169 156 memset(msgbuf, 0, MAX_MSG_SIZE); 170 157 hdr->op = op_bootrequest; 171 158 hdr->htype = 1; /* AHRD_ETHERNET */ 172 hdr->hlen = ETH_ADDR_SIZE;173 hdr->xid = host2uint32_t_be( xid);174 hdr->flags = host2uint16_t_be(flag_broadcast);175 176 eth_addr_encode(&dlink->link_info.mac_addr, hdr->chaddr);159 hdr->hlen = sizeof(addr48_t); 160 hdr->xid = host2uint32_t_be(42); 161 hdr->flags = flag_broadcast; 162 163 addr48(dlink->link_info.mac_addr, hdr->chaddr); 177 164 hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic); 178 165 179 i = 0; 180 181 opt[i++] = opt_msg_type; 182 opt[i++] = 1; 183 opt[i++] = msg_dhcpdiscover; 184 185 opt[i++] = opt_param_req_list; 186 opt[i++] = 3; 187 opt[i++] = 1; /* subnet mask */ 188 opt[i++] = 6; /* DNS server */ 189 opt[i++] = 3; /* router */ 190 191 opt[i++] = opt_end; 192 193 return dhcp_send(&dlink->dt, msgbuf, sizeof(dhcp_hdr_t) + i); 166 opt[0] = opt_msg_type; 167 opt[1] = 1; 168 opt[2] = msg_dhcpdiscover; 169 opt[3] = opt_end; 170 171 return dhcp_send(&dlink->dt, msgbuf, sizeof(dhcp_hdr_t) + 4); 194 172 } 195 173 … … 204 182 hdr->htype = 1; /* AHRD_ETHERNET */ 205 183 hdr->hlen = 6; 206 hdr->xid = host2uint32_t_be(offer->xid); 207 hdr->flags = host2uint16_t_be(flag_broadcast); 208 eth_addr_encode(&dlink->link_info.mac_addr, hdr->chaddr); 184 hdr->xid = host2uint32_t_be(42); 185 hdr->flags = flag_broadcast; 186 hdr->ciaddr = host2uint32_t_be(offer->oaddr.addr); 187 addr48(dlink->link_info.mac_addr, hdr->chaddr); 209 188 hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic); 210 189 … … 278 257 279 258 inet_naddr_set(yiaddr.addr, 0, &offer->oaddr); 280 offer->xid = uint32_t_be2host(hdr->xid);281 259 282 260 msgb = (uint8_t *)msg; … … 478 456 return ENOMEM; 479 457 480 rc = rndgen_create(&dlink->rndgen);481 if (rc != EOK)482 goto error;483 484 458 dlink->link_id = link_id; 485 459 dlink->timeout = fibril_timer_create(NULL); … … 519 493 return EOK; 520 494 error: 521 if (dlink != NULL && dlink->rndgen != NULL)522 rndgen_destroy(dlink->rndgen);523 495 if (dlink != NULL && dlink->timeout != NULL) 524 496 fibril_timer_destroy(dlink->timeout);
Note:
See TracChangeset
for help on using the changeset viewer.