Changeset 10991

Timestamp:

02/14/06 02:30:42 (18 years ago)

Author:

piso

Message:

Socket extensions (Erik Huelsmann).

Location:

trunk/j/src/org/armedbear/lisp

Files:

• autoloads.lisp (modified) (3 diffs)
• socket.lisp (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/autoloads.lisp

@@ -1 +1 @@
 ;;; autoloads.lisp
 ;;;
-;;; Copyright (C) 2003-2005 Peter Graves
-;;; $Id: autoloads.lisp,v 1.204 2006-01-09 19:19:21 piso Exp $
+;;; Copyright (C) 2003-2006 Peter Graves
+;;; $Id: autoloads.lisp,v 1.205 2006-02-14 02:30:42 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -250 +250 @@
 (export 'run-shell-command)
 (autoload 'run-shell-command)
+
 (export 'make-socket)
 (autoload 'make-socket "socket")
@@ -262 +263 @@
 (export 'get-socket-stream)
 (autoload 'get-socket-stream "socket")
+(export 'socket-peer-port)
+(autoload 'socket-peer-port "socket")
+(export 'socket-local-port)
+(autoload 'socket-local-port "socket")
+(export 'socket-local-address)
+(autoload 'socket-local-address "socket")
+(export 'socket-peer-address)
+(autoload 'socket-peer-address "socket")
+
 (export '(grovel-java-definitions compile-system))
 (autoload '(grovel-java-definitions compile-system) "compile-system")

trunk/j/src/org/armedbear/lisp/socket.lisp

@@ -1 +1 @@
 ;;; socket.lisp
 ;;;
-;;; Copyright (C) 2004 Peter Graves
-;;; $Id: socket.lisp,v 1.2 2004-08-03 16:47:00 piso Exp $
+;;; Copyright (C) 2004-2006 Peter Graves
+;;; $Id: socket.lisp,v 1.3 2006-02-14 02:30:19 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -45 +45 @@
   (%server-socket-close socket))
 
+(declaim (inline %socket-address %socket-port))
+(defun %socket-address (socket addressName)
+   (java:jcall "getHostAddress" (java:jcall-raw addressName socket)))
+
+(defun %socket-port (socket portName)
+   (java:jcall portName socket))
+
+(defun socket-local-address (socket)
+   "Returns the local address of the given socket as a dotted quad string."
+   (%socket-address socket "getLocalAddress"))
+
+(defun socket-peer-address (socket)
+   "Returns the peer address of the given socket as a dotted quad string."
+   (%socket-address socket "getInetAddress"))
+
+(defun socket-local-port (socket)
+   "Returns the local port number of the given socket."
+   (%socket-port socket "getLocalPort"))
+
+(defun socket-peer-port (socket)
+   "Returns the peer port number of the given socket."
+   (%socket-port socket "getPort"))
+
 (provide '#:socket)