| nb_net.c (126269) | nb_net.c (150802) |
|---|---|
| 1/* 2 * Copyright (c) 2000, Boris Popov 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 16 unchanged lines hidden (view full) --- 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * 32 * $Id: nb_net.c,v 1.4 2001/02/16 02:46:12 bp Exp $ | 1/* 2 * Copyright (c) 2000, Boris Popov 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 16 unchanged lines hidden (view full) --- 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * 32 * $Id: nb_net.c,v 1.4 2001/02/16 02:46:12 bp Exp $ |
| 33 * $FreeBSD: head/contrib/smbfs/lib/smb/nb_net.c 126269 2004-02-26 08:49:19Z tjr $ | 33 * $FreeBSD: head/contrib/smbfs/lib/smb/nb_net.c 150802 2005-10-02 08:32:49Z bp $ |
| 34 */ 35#include <sys/param.h> 36#include <sys/socket.h> 37 38#include <net/if.h> 39 40#include <ctype.h> 41#include <netdb.h> --- 19 unchanged lines hidden (view full) --- 61 cp = strchr(buf, '.'); 62 if (cp) 63 *cp = 0; 64 strcpy(name, buf); 65 return 0; 66} 67 68int | 34 */ 35#include <sys/param.h> 36#include <sys/socket.h> 37 38#include <net/if.h> 39 40#include <ctype.h> 41#include <netdb.h> --- 19 unchanged lines hidden (view full) --- 61 cp = strchr(buf, '.'); 62 if (cp) 63 *cp = 0; 64 strcpy(name, buf); 65 return 0; 66} 67 68int |
| 69nb_resolvehost_in(const char *name, struct sockaddr **dest) | 69nb_resolvehost_in(const char *name, struct sockaddr **dest, long smbtcpport) |
| 70{ 71 struct hostent* h; 72 struct sockaddr_in *sinp; 73 int len; 74 75 h = gethostbyname(name); 76 if (!h) { 77 warnx("can't get server address `%s': ", name); --- 11 unchanged lines hidden (view full) --- 89 len = sizeof(struct sockaddr_in); 90 sinp = malloc(len); 91 if (sinp == NULL) 92 return ENOMEM; 93 bzero(sinp, len); 94 sinp->sin_len = len; 95 sinp->sin_family = h->h_addrtype; 96 memcpy(&sinp->sin_addr.s_addr, h->h_addr, 4); | 70{ 71 struct hostent* h; 72 struct sockaddr_in *sinp; 73 int len; 74 75 h = gethostbyname(name); 76 if (!h) { 77 warnx("can't get server address `%s': ", name); --- 11 unchanged lines hidden (view full) --- 89 len = sizeof(struct sockaddr_in); 90 sinp = malloc(len); 91 if (sinp == NULL) 92 return ENOMEM; 93 bzero(sinp, len); 94 sinp->sin_len = len; 95 sinp->sin_family = h->h_addrtype; 96 memcpy(&sinp->sin_addr.s_addr, h->h_addr, 4); |
| 97 sinp->sin_port = htons(SMB_TCP_PORT); | 97 sinp->sin_port = htons(smbtcpport); |
| 98 *dest = (struct sockaddr*)sinp; 99 return 0; 100} 101 102int 103nb_enum_if(struct nb_ifdesc **iflist, int maxif) 104{ 105 struct nb_ifdesc *ifd; --- 53 unchanged lines hidden (view full) --- 159 struct sockaddr_nb *snb; 160 int error; 161 162 error = nb_sockaddr(NULL, np, &snb); 163 if (error) 164 return error; 165 do { 166 if (hint) { | 98 *dest = (struct sockaddr*)sinp; 99 return 0; 100} 101 102int 103nb_enum_if(struct nb_ifdesc **iflist, int maxif) 104{ 105 struct nb_ifdesc *ifd; --- 53 unchanged lines hidden (view full) --- 159 struct sockaddr_nb *snb; 160 int error; 161 162 error = nb_sockaddr(NULL, np, &snb); 163 if (error) 164 return error; 165 do { 166 if (hint) { |
| 167 error = nb_resolvehost_in(host, snb); | 167 error = nb_resolvehost_in(host, snb, SMB_TCP_PORT); |
| 168 if (error) 169 break; 170 } else { 171 error = nb_resolvename(server); 172 } 173 } while(0); 174 if (!error) { 175 *dst = snb; 176 } else 177 nb_snbfree(snb); 178 return error; 179} 180*/ | 168 if (error) 169 break; 170 } else { 171 error = nb_resolvename(server); 172 } 173 } while(0); 174 if (!error) { 175 *dst = snb; 176 } else 177 nb_snbfree(snb); 178 return error; 179} 180*/ |