mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V1.3 to HEAD (3117:3125)
svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3117 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3125 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3402 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -412,7 +412,7 @@ public class NetBIOSNameServer extends NetworkServer implements Runnable
|
||||
|
||||
// Allocate the datagram packet, using the add name buffer
|
||||
|
||||
DatagramPacket pkt = new DatagramPacket(buf, len, dest, getPort());
|
||||
DatagramPacket pkt = new DatagramPacket(buf, len, dest, RFCNetBIOSProtocol.NAME_PORT);
|
||||
|
||||
// Send the add name request
|
||||
|
||||
@@ -469,7 +469,7 @@ public class NetBIOSNameServer extends NetworkServer implements Runnable
|
||||
|
||||
// Allocate the datagram packet, using the refresh name buffer
|
||||
|
||||
DatagramPacket pkt = new DatagramPacket(buf, len, dest, getPort());
|
||||
DatagramPacket pkt = new DatagramPacket(buf, len, dest, RFCNetBIOSProtocol.NAME_PORT);
|
||||
|
||||
// Send the refresh name request
|
||||
|
||||
@@ -525,7 +525,7 @@ public class NetBIOSNameServer extends NetworkServer implements Runnable
|
||||
|
||||
// Allocate the datagram packet, using the add name buffer
|
||||
|
||||
DatagramPacket pkt = new DatagramPacket(buf, len, dest, getPort());
|
||||
DatagramPacket pkt = new DatagramPacket(buf, len, dest, RFCNetBIOSProtocol.NAME_PORT);
|
||||
|
||||
// Send the add name request
|
||||
|
||||
@@ -683,7 +683,12 @@ public class NetBIOSNameServer extends NetworkServer implements Runnable
|
||||
{
|
||||
super("NetBIOS", config);
|
||||
|
||||
// Set the NetBIOS name server port
|
||||
|
||||
setServerPort( config.getNetBIOSNamePort());
|
||||
|
||||
// Perform common constructor code
|
||||
|
||||
commonConstructor();
|
||||
}
|
||||
|
||||
@@ -712,7 +717,6 @@ public class NetBIOSNameServer extends NetworkServer implements Runnable
|
||||
// Set the local address to bind the server to, and server port
|
||||
|
||||
setBindAddress(getConfiguration().getNetBIOSBindAddress());
|
||||
setServerPort(RFCNetBIOSProtocol.NAME_PORT);
|
||||
|
||||
// Copy the WINS server addresses, if set
|
||||
|
||||
@@ -1716,7 +1720,6 @@ public class NetBIOSNameServer extends NetworkServer implements Runnable
|
||||
protected final void sendPacket(NetBIOSPacket nbpkt, int len, InetAddress replyAddr, int replyPort)
|
||||
throws java.io.IOException
|
||||
{
|
||||
|
||||
// Allocate the datagram packet, using the add name buffer
|
||||
|
||||
DatagramPacket pkt = new DatagramPacket(nbpkt.getBuffer(), len, replyAddr, replyPort);
|
||||
|
Reference in New Issue
Block a user