Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d18dc005 authored by JP Abgrall's avatar JP Abgrall
Browse files

resolved conflicts for merge of a88c13bf to honeycomb-plus-aosp 



The Android.mk's LOCAL_SRC_FILES was different from gingerbread.

Change-Id: Ie1777a5f449e6b135320e92d0dc1c593869aa266
Signed-off-by: default avatarJP Abgrall <jpa@google.com>
parents 189de0c1 a88c13bf

include/cutils/qtaguid.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef __CUTILS_QTAGUID_H

#define __CUTILS_QTAGUID_H



#include <stdint.h>

#include <sys/types.h>

#include <unistd.h>



#ifdef __cplusplus

extern "C" {

#endif



/*

 * Set tags (and owning UIDs) for network sockets.

*/

extern int qtaguid_tagSocket(int sockfd, int tag, uid_t uid);



/*

 * Untag a network socket before closing.

*/

extern int qtaguid_untagSocket(int sockfd);



#ifdef __cplusplus

}

#endif



#endif /* __CUTILS_QTAG_UID_H */

libcutils/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ else #!sim 
# ========================================================

include $(CLEAR_VARS)

LOCAL_MODULE := libcutils

LOCAL_SRC_FILES := $(commonSources) ashmem-dev.c mq.c android_reboot.c uevent.c

LOCAL_SRC_FILES := $(commonSources) ashmem-dev.c mq.c android_reboot.c uevent.c qtaguid.c



ifeq ($(TARGET_ARCH),arm)

LOCAL_SRC_FILES += arch-arm/memset32.S

libcutils/qtaguid.c

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/* libcutils/qtaguid.c

**

** Copyright 2011, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/



#define LOG_TAG "qtaguid"



#include <cutils/qtaguid.h>

#include <cutils/log.h>

#include <errno.h>

#include <fcntl.h>

#include <stdio.h>

#include <string.h>

#include <unistd.h>



extern int qtaguid_tagSocket(int sockfd, int tag, uid_t uid) {

    char lineBuf[128];

    int fd, cnt = 0, res = 0;

    uint64_t kTag = (uint64_t)tag << 32;

    snprintf(lineBuf, sizeof(lineBuf), "t %d %llu %d", sockfd, kTag, uid);



    LOGI("Tagging socket %d with tag %llx(%d) for uid %d", sockfd, kTag, tag, uid);

    fd = open("/proc/net/xt_qtaguid/ctrl", O_WRONLY);

    if (fd < 0) {

        return -errno;

    }



    cnt = write(fd, lineBuf, strlen(lineBuf));

    if (cnt < 0) {

        res = -errno;

    }



    close(fd);

    return res;

}



extern int qtaguid_untagSocket(int sockfd) {

    char lineBuf[128];

    int fd, cnt = 0, res = 0;

    snprintf(lineBuf, sizeof(lineBuf), "u %d", sockfd);



    LOGI("Untagging socket %d", sockfd);

    fd = open("/proc/net/xt_qtaguid/ctrl", O_WRONLY);

    if (fd < 0) {

        return -errno;

    }



    cnt = write(fd, lineBuf, strlen(lineBuf));

    if (cnt < 0) {

        res = -errno;

    }



    close(fd);

    return res;

}