/[magellan-source]/trunk/mkinitrd-magellan/busybox/networking/udhcp/serverpacket.c

Diff of /trunk/mkinitrd-magellan/busybox/networking/udhcp/serverpacket.c

Parent Directory | Revision Log | View Patch Patch

-revision 532 by niro,
Sat Sep  1 22:45:15 2007 UTC
+revision 816 by niro,
Fri Apr 24 18:33:46 2009 UTC
 Line 21
   */
  #include "common.h"
+ #include "dhcpc.h"
  #include "dhcpd.h"
  #include "options.h"
-Line 30 
 static int send_packet_to_relay(struct d
+Line 31 
 static int send_packet_to_relay(struct d
  {
  	DEBUG("Forwarding packet to relay");
- 	return udhcp_kernel_packet(payload, server_config.server, SERVER_PORT,
+ 	return udhcp_send_kernel_packet(payload, server_config.server, SERVER_PORT,
  			payload->giaddr, SERVER_PORT);
  }
-Line 38 
 static int send_packet_to_relay(struct d
+Line 39 
 static int send_packet_to_relay(struct d
  /* send a packet to a specific arp address and ip address by creating our own ip packet */
  static int send_packet_to_client(struct dhcpMessage *payload, int force_broadcast)
  {
- 	uint8_t *chaddr;
+ 	const uint8_t *chaddr;
  	uint32_t ciaddr;
  	if (force_broadcast) {
-Line 49 
 static int send_packet_to_client(struct
+Line 50 
 static int send_packet_to_client(struct
  		DEBUG("unicasting packet to client ciaddr");
  		ciaddr = payload->ciaddr;
  		chaddr = payload->chaddr;
- 	} else if (ntohs(payload->flags) & BROADCAST_FLAG) {
+ 	} else if (payload->flags & htons(BROADCAST_FLAG)) {
  		DEBUG("broadcasting packet to client (requested)");
  		ciaddr = INADDR_BROADCAST;
  		chaddr = MAC_BCAST_ADDR;
-Line 58 
 static int send_packet_to_client(struct
+Line 59 
 static int send_packet_to_client(struct
  		ciaddr = payload->yiaddr;
  		chaddr = payload->chaddr;
  	}
- 	return udhcp_raw_packet(payload, server_config.server, SERVER_PORT,
+ 	return udhcp_send_raw_packet(payload,
- 			ciaddr, CLIENT_PORT, chaddr, server_config.ifindex);
+ 		/*src*/ server_config.server, SERVER_PORT,
+ 		/*dst*/ ciaddr, CLIENT_PORT, chaddr,
+ 		server_config.ifindex);
  }
  /* send a dhcp packet, if force broadcast is set, the packet will be broadcast to the client */
  static int send_packet(struct dhcpMessage *payload, int force_broadcast)
  {
- 	int ret;
  	if (payload->giaddr)
- 		ret = send_packet_to_relay(payload);
+ 		return send_packet_to_relay(payload);
- 	else ret = send_packet_to_client(payload, force_broadcast);
+ 	return send_packet_to_client(payload, force_broadcast);
- 	return ret;
  }
 Line 99 
 static void add_bootp_options(struct dhc
  /* send a DHCP OFFER to a DHCP DISCOVER */
- int sendOffer(struct dhcpMessage *oldpacket)
+ int FAST_FUNC send_offer(struct dhcpMessage *oldpacket)
  {
  	struct dhcpMessage packet;
  	struct dhcpOfferedAddr *lease = NULL;
 Line 122 
 int sendOffer(struct dhcpMessage *oldpac
  			if (!lease_expired(lease))
  				lease_time_align = lease->expires - time(0);
  			packet.yiaddr = lease->yiaddr;
  		/* Or the client has a requested ip */
  		} else if ((req = get_option(oldpacket, DHCP_REQUESTED_IP))
- 			/* Don't look here (ugly hackish thing to do) */
+ 		 /* Don't look here (ugly hackish thing to do) */
- 			&& memcpy(&req_align, req, 4)
+ 		 && memcpy(&req_align, req, 4)
- 			/* and the ip is in the lease range */
+ 		 /* and the ip is in the lease range */
- 			&& ntohl(req_align) >= ntohl(server_config.start)
+ 		 && ntohl(req_align) >= server_config.start_ip
- 			&& ntohl(req_align) <= ntohl(server_config.end)
+ 		 && ntohl(req_align) <= server_config.end_ip
- 			&& !static_lease_ip /* Check that its not a static lease */
+ 		 && !static_lease_ip /* Check that its not a static lease */
- 			/* and is not already taken/offered */
+ 		 /* and is not already taken/offered */
- 			&& (!(lease = find_lease_by_yiaddr(req_align))
+ 		 && (!(lease = find_lease_by_yiaddr(req_align))
- 				/* or its taken, but expired */ /* ADDME: or maybe in here */
+ 			/* or its taken, but expired */ /* ADDME: or maybe in here */
- 				|| lease_expired(lease))
+ 			|| lease_expired(lease))
  		) {
  			packet.yiaddr = req_align; /* FIXME: oh my, is there a host using this IP? */
  			/* otherwise, find a free IP */
-Line 142 
 int sendOffer(struct dhcpMessage *oldpac
+Line 141 
 int sendOffer(struct dhcpMessage *oldpac
  			/* Is it a static lease? (No, because find_address skips static lease) */
  			packet.yiaddr = find_address(0);
  			/* try for an expired lease */
- 			if (!packet.yiaddr) packet.yiaddr = find_address(1);
+ 			if (!packet.yiaddr)
+ 				packet.yiaddr = find_address(1);
  		}
  		if (!packet.yiaddr) {
 Line 187 
 int sendOffer(struct dhcpMessage *oldpac
  }
- int sendNAK(struct dhcpMessage *oldpacket)
+ int FAST_FUNC send_NAK(struct dhcpMessage *oldpacket)
  {
  	struct dhcpMessage packet;
 Line 198 
 int sendNAK(struct dhcpMessage *oldpacke
  }
- int sendACK(struct dhcpMessage *oldpacket, uint32_t yiaddr)
+ int FAST_FUNC send_ACK(struct dhcpMessage *oldpacket, uint32_t yiaddr)
  {
  	struct dhcpMessage packet;
  	struct option_set *curr;
 Line 209 
 int sendACK(struct dhcpMessage *oldpacke
  	init_packet(&packet, oldpacket, DHCPACK);
  	packet.yiaddr = yiaddr;
- 	if ((lease_time = get_option(oldpacket, DHCP_LEASE_TIME))) {
+ 	lease_time = get_option(oldpacket, DHCP_LEASE_TIME);
+ 	if (lease_time) {
  		memcpy(&lease_time_align, lease_time, 4);
  		lease_time_align = ntohl(lease_time_align);
  		if (lease_time_align > server_config.lease)
-Line 236 
 int sendACK(struct dhcpMessage *oldpacke
+Line 237 
 int sendACK(struct dhcpMessage *oldpacke
  		return -1;
  	add_lease(packet.chaddr, packet.yiaddr, lease_time_align);
+ 	if (ENABLE_FEATURE_UDHCPD_WRITE_LEASES_EARLY) {
+ 		/* rewrite the file with leases at every new acceptance */
+ 		write_leases();
+ 	}
  	return 0;
  }
- int send_inform(struct dhcpMessage *oldpacket)
+ int FAST_FUNC send_inform(struct dhcpMessage *oldpacket)
  {
  	struct dhcpMessage packet;
  	struct option_set *curr;

 Legend:



Removed from v.532
 


changed lines


 
Added in v.816
 Legend:



Removed from v.532
 


changed lines


 
Added in v.816
-Removed from v.532
+Added in v.816