diff options
| -rw-r--r-- | source4/nbt_server/interfaces.c | 6 | ||||
| -rw-r--r-- | source4/nbt_server/packet.c | 29 |
2 files changed, 35 insertions, 0 deletions
diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c index 9c26925b32..bb599b4fcd 100644 --- a/source4/nbt_server/interfaces.c +++ b/source4/nbt_server/interfaces.c @@ -40,6 +40,12 @@ static void nbtd_request_handler(struct nbt_name_socket *nbtsock, return; } + /* see if its from one of our own interfaces - if so, then ignore it */ + if (nbtd_self_packet(nbtsock, packet, src_address, src_port)) { + DEBUG(10,("Ignoring self packet from %s:%d\n", src_address, src_port)); + return; + } + /* the request is to us in our role as a B node */ switch (packet->operation & NBT_OPCODE) { case NBT_OPCODE_QUERY: diff --git a/source4/nbt_server/packet.c b/source4/nbt_server/packet.c index 337c77f33a..c5ed0b41ce 100644 --- a/source4/nbt_server/packet.c +++ b/source4/nbt_server/packet.c @@ -36,3 +36,32 @@ void nbtd_bad_packet(struct nbt_name_packet *packet, } } + +/* + see if an incoming packet is from one of our own interfaces +*/ +BOOL nbtd_self_packet(struct nbt_name_socket *nbtsock, + struct nbt_name_packet *packet, + const char *src_address, int src_port) +{ + struct nbt_interface *iface = talloc_get_type(nbtsock->incoming.private, + struct nbt_interface); + struct nbt_server *nbtsrv = iface->nbtsrv; + + if (src_port != lp_nbt_port()) { + return False; + } + + for (iface=nbtsrv->interfaces;iface;iface=iface->next) { + if (strcmp(src_address, iface->ip_address) == 0) { + return True; + } + } + + if (nbtsrv->bcast_interface && + strcmp(src_address, nbtsrv->bcast_interface->ip_address) == 0) { + return True; + } + + return False; +} |