Skip to content

Update to allow static IP Ethernet methods to specify DNS server too #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Aug 31, 2011
Merged

Update to allow static IP Ethernet methods to specify DNS server too #32

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
88e858f
Fix for issue 439. UDP API changed to derive from Stream. The old sen…
amcewen Jan 10, 2011
a3c7a1b
Merge remote branch 'upstream/master' into dhcp-dns
amcewen Jan 13, 2011
5caad5b
Added a method to read data into a char buffer so that character-base…
amcewen Jan 13, 2011
a42dc0b
Fix for issue 62, adding DHCP support. New begin() method added to E…
amcewen Jan 16, 2011
a310cb8
Proposed fix for issue 243, adding DNS to the Ethernet library. Uses…
amcewen Jan 25, 2011
4000c91
Added new method to UDP to take a hostname rather than an IP address.…
amcewen Feb 4, 2011
7f18110
Fixed bug in parsePacket where it could block indefinitely if called …
amcewen Feb 4, 2011
3540d92
Added Printable interface class to allow printing of classes such as …
amcewen Apr 1, 2011
facbd27
Added a brief explanation of how you'd use Printable
amcewen Apr 2, 2011
35a78b1
Added virtual destructor to Printable, which also requires new and de…
amcewen Apr 10, 2011
8dfee1f
Merge remote branch 'upstream/new-extension'
amcewen Jun 11, 2011
789e22a
Added a way to specify the DNS server to use with static IP
amcewen Jun 12, 2011
ffd2cec
Tweak to defines to support a couple more AVRs - the ATmega32U4 and A…
amcewen Jun 16, 2011
6b2dec0
Fixed bug where the DHCP client didn't correctly handle a response co…
amcewen Jul 7, 2011
4588120
Merge branch 'new-extension' of https://github.com/arduino/Arduino
amcewen Aug 27, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added a way to specify the DNS server to use with static IP
  • Loading branch information
@amcewen
amcewen committed Jun 12, 2011
commit 789e22add2f233d2ef8cbbc8ff747f1737972fe9
18 changes: 14 additions & 4 deletions libraries/Ethernet/Ethernet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,37 @@ int EthernetClass::begin(uint8_t *mac_address)
}

void EthernetClass::begin(uint8_t *mac_address, IPAddress local_ip)
{
// Assume the DNS server will be the machine on the same network as the local IP
// but with last octet being '1'
IPAddress dns_server = local_ip;
dns_server[3] = 1;
begin(mac_address, local_ip, dns_server);
}

void EthernetClass::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server)
{
// Assume the gateway will be the machine on the same network as the local IP
// but with last octet being '1'
IPAddress gateway = local_ip;
gateway[3] = 1;
begin(mac_address, local_ip, gateway);
begin(mac_address, local_ip, dns_server, gateway);
}

void EthernetClass::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress gateway)
void EthernetClass::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway)
{
IPAddress subnet(255, 255, 255, 0);
begin(mac_address, local_ip, gateway, subnet);
begin(mac_address, local_ip, dns_server, gateway, subnet);
}

void EthernetClass::begin(uint8_t *mac, IPAddress local_ip, IPAddress gateway, IPAddress subnet)
void EthernetClass::begin(uint8_t *mac, IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet)
{
W5100.init();
W5100.setMACAddress(mac);
W5100.setIPAddress(local_ip._address);
W5100.setGatewayIp(gateway._address);
W5100.setSubnetMask(subnet._address);
_dnsServerAddress = dns_server;
}

IPAddress EthernetClass::localIP()
Expand Down
5 changes: 3 additions & 2 deletions libraries/Ethernet/Ethernet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ class EthernetClass {
// Returns 0 if the DHCP configuration failed, and 1 if it succeeded
int begin(uint8_t *mac_address);
void begin(uint8_t *mac_address, IPAddress local_ip);
void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress gateway);
void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress gateway, IPAddress subnet);
void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server);
void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway);
void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet);

IPAddress localIP();
IPAddress subnetMask();
Expand Down