From 2c9008772ef9c015569204bede90152ed975d0cc Mon Sep 17 00:00:00 2001
From: Diego Nehab <diego@tecgraf.puc-rio.br>
Date: Tue, 6 Mar 2001 19:46:42 +0000
Subject: [PATCH] Updated to remove use of global methods. Conforming to
 LuaSocket release 1.2.1

---
 etc/dict.lua         | 12 ++++++------
 samples/echoclnt.lua |  8 ++++----
 samples/echosrvr.lua | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/etc/dict.lua b/etc/dict.lua
index 683cb45..c620cc4 100644
--- a/etc/dict.lua
+++ b/etc/dict.lua
@@ -17,13 +17,13 @@ while 1 do
  if w=="=" then
   w=read"*l"
   verbose(">>>",w,"\n")
-  send(s,w,"\r\n")
+  s:send(w,"\r\n")
  else
   verbose(">>> looking up `",w,"'\n")
-  send(s,"DEFINE wn ",w,"\r\n")
+  s:send("DEFINE wn ",w,"\r\n")
  end
  while 1 do
-  local l=receive(s)
+  local l=s:receive()
   if l==nil then break end
   if strfind(l,"^[0-9]") then
    write("<<< ",l,"\n")
@@ -34,6 +34,6 @@ while 1 do
  end
 end
 
-send(s,"QUIT\r\n")
-verbose("<<< ",receive(s),"\n")
-close(s)
+s:send("QUIT\r\n")
+verbose("<<< ",s:receive(),"\n")
+s:close()
diff --git a/samples/echoclnt.lua b/samples/echoclnt.lua
index d1c56c7..043b2f0 100644
--- a/samples/echoclnt.lua
+++ b/samples/echoclnt.lua
@@ -7,15 +7,15 @@ end
 host = toip(host)
 udp, err = udpsocket()
 if not udp then print(err) exit() end
-err = setpeername(udp, host, port)
+err = udp:setpeername(host, port)
 if err then print(err) exit() end
-print("Using host '" ..host.. "' and port " ..port.. "...")
+print("Using host '" ..host.. "' and port " .. port .. "...")
 while 1 do
 	line = read()
 	if not line then exit() end
-	err = send(udp, line)
+	err = udp:send(line)
 	if err then print(err) exit() end
-	dgram, err = receive(udp)
+	dgram, err = udp:receive()
 	if not dgram then print(err) exit() end
 	print(dgram)
 end
diff --git a/samples/echosrvr.lua b/samples/echosrvr.lua
index fe7da06..330f9e6 100644
--- a/samples/echosrvr.lua
+++ b/samples/echosrvr.lua
@@ -7,16 +7,16 @@ end
 print("Binding to host '" ..host.. "' and port " ..port.. "...")
 udp, err = udpsocket()
 if not udp then print(err) exit() end
-err = setsockname(udp, host, port)
+err = udp:setsockname(host, port)
 if err then print(err) exit() end
-timeout(udp, 5)
-ip, port = getsockname(udp)
+udp:timeout(5)
+ip, port = udp:getsockname()
 print("Waiting packets on " .. ip .. ":" .. port .. "...")
 while 1 do
-	dgram, ip, port = receivefrom(udp)
+	dgram, ip, port = udp:receivefrom()
 	if not dgram then print(ip) 
 	else 
 		print("Echoing from " .. ip .. ":" .. port)
-		sendto(udp, dgram, ip, port)
+		udp:sendto(dgram, ip, port)
 	end
 end