Merge change 2470 into donut
* changes: Fix getservent() so that it returns s_port in network byte order. Also add a new document detailing known issues in the C library.
This commit is contained in:
20
libc/docs/ISSUES.TXT
Normal file
20
libc/docs/ISSUES.TXT
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
Bionic C Library Issues:
|
||||||
|
========================
|
||||||
|
|
||||||
|
This document lists important known issues of various releases
|
||||||
|
of the Bionic C library. Note that these differ from specific
|
||||||
|
implementation choices that are documented in the OVERVIEW.TXT
|
||||||
|
document.
|
||||||
|
|
||||||
|
Currently known issues:
|
||||||
|
-----------------------
|
||||||
|
|
||||||
|
- The C library initialization will improperly run static C++
|
||||||
|
constructors located in shared libraries twice.
|
||||||
|
|
||||||
|
Android-1.5 issues:
|
||||||
|
-------------------
|
||||||
|
|
||||||
|
- getservbyname() returned the port number in the s_port field of
|
||||||
|
the 'struct servent' structure in host-byte-order, instead of
|
||||||
|
network-byte-order.
|
||||||
@@ -27,6 +27,7 @@
|
|||||||
*/
|
*/
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#include <sys/endian.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include "servent.h"
|
#include "servent.h"
|
||||||
#include "services.h"
|
#include "services.h"
|
||||||
@@ -54,6 +55,7 @@ getservent_r( res_static rs )
|
|||||||
int namelen;
|
int namelen;
|
||||||
int nn,count;
|
int nn,count;
|
||||||
int total = 0;
|
int total = 0;
|
||||||
|
int port;
|
||||||
char* p2;
|
char* p2;
|
||||||
|
|
||||||
p = rs->servent_ptr;
|
p = rs->servent_ptr;
|
||||||
@@ -92,9 +94,12 @@ getservent_r( res_static rs )
|
|||||||
memcpy( rs->servent.s_name, p+1, namelen );
|
memcpy( rs->servent.s_name, p+1, namelen );
|
||||||
rs->servent.s_name[namelen] = 0;
|
rs->servent.s_name[namelen] = 0;
|
||||||
p += 1 + namelen;
|
p += 1 + namelen;
|
||||||
rs->servent.s_port = ((((unsigned char*)p)[0] << 8) |
|
|
||||||
((unsigned char*)p)[1]);
|
|
||||||
|
|
||||||
|
/* s_port must be in network byte order */
|
||||||
|
port = ((((unsigned char*)p)[0] << 8) |
|
||||||
|
((unsigned char*)p)[1]);
|
||||||
|
|
||||||
|
rs->servent.s_port = htons(port);
|
||||||
rs->servent.s_proto = p[2] == 't' ? "tcp" : "udp";
|
rs->servent.s_proto = p[2] == 't' ? "tcp" : "udp";
|
||||||
p += 4; /* skip port(2) + proto(1) + aliascount(1) */
|
p += 4; /* skip port(2) + proto(1) + aliascount(1) */
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user