Backed out previous checkin. NSPRPUB_RELEASE_3_5_LANDING_BASE
authorsrinivas%netscape.com
Wed, 06 Oct 1999 19:33:52 +0000
changeset 850 4cf048b7395e92eaf6a787439abed5713033b8d8
parent 849 e0f00cc5310329895406e9480419ac72e7b11695
child 851 c6afd3661de449bb37e696fc6d0eede0ecc2f6b1
child 859 5e89a7de026427c2c8d8520aeb5544c5bacf5f30
push idunknown
push userunknown
push dateunknown
Backed out previous checkin.
pr/src/pthreads/ptio.c
pr/tests/sockopt.c
--- a/pr/src/pthreads/ptio.c
+++ b/pr/src/pthreads/ptio.c
@@ -2477,17 +2477,16 @@ static PRStatus pt_GetSocketOption(PRFil
                     (linger.l_onoff) ? PR_TRUE : PR_FALSE;
                 data->value.linger.linger =
                     PR_SecondsToInterval(linger.l_linger);
                 break;
             }
             case PR_SockOpt_Reuseaddr:
             case PR_SockOpt_Keepalive:
             case PR_SockOpt_NoDelay:
-            case PR_SockOpt_Broadcast:
             {
                 PRIntn value;
                 length = sizeof(PRIntn);
                 rv = getsockopt(
                     fd->secret->md.osfd, level, name, (char*)&value, &length);
                 PR_ASSERT((-1 == rv) || (sizeof(PRIntn) == length));
                 data->value.reuse_addr = (0 == value) ? PR_FALSE : PR_TRUE;
                 break;
@@ -2596,17 +2595,16 @@ static PRStatus pt_SetSocketOption(PRFil
                 linger.l_linger = PR_IntervalToSeconds(data->value.linger.linger);
                 rv = setsockopt(
                     fd->secret->md.osfd, level, name, (char*)&linger, sizeof(linger));
                 break;
             }
             case PR_SockOpt_Reuseaddr:
             case PR_SockOpt_Keepalive:
             case PR_SockOpt_NoDelay:
-            case PR_SockOpt_Broadcast:
             {
                 PRIntn value = (data->value.reuse_addr) ? 1 : 0;
                 rv = setsockopt(
                     fd->secret->md.osfd, level, name,
                     (char*)&value, sizeof(PRIntn));
                 break;
             }
             case PR_SockOpt_McastLoopback:
--- a/pr/tests/sockopt.c
+++ b/pr/tests/sockopt.c
@@ -79,17 +79,16 @@ PRIntn main(PRIntn argc, char *argv)
         "PR_SockOpt_AddMember",       /* add an IP group membership */
         "PR_SockOpt_DropMember",      /* drop an IP group membership */
         "PR_SockOpt_McastInterface",  /* multicast interface address */
         "PR_SockOpt_McastTimeToLive", /* multicast timetolive */
         "PR_SockOpt_McastLoopback",   /* multicast loopback */
 
         "PR_SockOpt_NoDelay",         /* don't delay send to coalesce packets */
         "PR_SockOpt_MaxSegment",      /* maximum segment size */
-        "PR_SockOpt_Broadcast",       /* Enable broadcast */
         "PR_SockOpt_Last"
     };
 
     err = PR_GetSpecialFD(PR_StandardError);
     PR_STDIO_INIT();
 
 #ifdef XP_MAC
 	SetupMacPrintfLog("sockopt.log");
@@ -139,20 +138,16 @@ PRIntn main(PRIntn argc, char *argv)
                 value = &segment;
                 size = &segmentsize;
                 break;
 
             case PR_SockOpt_IpTimeToLive:    /* time to live */
                 value = &ttl;
                 size = &ttlsize;
                 break;
-            case PR_SockOpt_Broadcast:
-                value = &boolean;
-                size = &booleansize;
-                break;
             case PR_SockOpt_IpTypeOfService: /* type of service and precedence */
             case PR_SockOpt_AddMember:       /* add an IP group membership */
             case PR_SockOpt_DropMember:      /* drop an IP group membership */
             case PR_SockOpt_McastInterface:  /* multicast interface address */
             case PR_SockOpt_McastTimeToLive: /* multicast timetolive */
             case PR_SockOpt_McastLoopback:   /* multicast loopback */
             default:
                 continue;
@@ -218,20 +213,16 @@ PRIntn main(PRIntn argc, char *argv)
                 case PR_SockOpt_NoDelay:
                     data.value.no_delay = PR_TRUE;         
                     break;    
 #ifndef WIN32
                 case PR_SockOpt_MaxSegment:
                     data.value.max_segment = segment;      
                     break;    
 #endif
-                case PR_SockOpt_Broadcast:
-                    fd = udp; 
-                    data.value.broadcast = PR_TRUE;         
-                    break;    
                 default: continue;
             }
 
 			/*
 			 * TCP_MAXSEG can only be read, not set
 			 */
             if (option != PR_SockOpt_MaxSegment) {
 #ifdef WIN32