abills.net.ua

ABillS - ~AsmodeuS~ Billing System
http://abills.net.ua/forum/

не могу пропатчить mpd-3.18

http://abills.net.ua/forum/viewtopic.php?f=2&t=2893

Страница 1 из 1

не могу пропатчить mpd-3.18

Добавлено: Сб сен 09, 2006 11:33 am
BECHA
freebsd 6.1, abills 0.33b, freeradius 1.1.3, mpd-3.18
на странице
http://abills.asmodeus.com.ua/wiki/doku ... ocs:mpd:ru
написано, что mpd из портов не пропатчится, поэтому делаю руками.
в архиве kha0s-mpd.tar.gz два diff файла:
mpd-3.18-drop-user-1.diff и mpd-3.18-sesson-traffic-limit.diff
скачал mpd по приведенной ссылке (http://abills.asmodeus.com.ua/soft/mpd-3.18.tar.gz)
tar -zxf mpd-3.18.tar.gz

patch < mpd-3.18-drop-user-1.diff

Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/link.c mpd-3.18/src/link.c
|--- mpd-3.18.orig/src/link.c Tue May 4 22:12:28 2004
|+++ mpd-3.18/src/link.c Fri May 14 13:43:59 2004
--------------------------
Patching file mpd-3.18/src/link.c using Plan A...
Hunk #1 succeeded at 236.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/link.h mpd-3.18/src/link.h
|--- mpd-3.18.orig/src/link.h Tue May 4 22:12:28 2004
|+++ mpd-3.18/src/link.h Fri May 14 13:43:59 2004
--------------------------
Patching file mpd-3.18/src/link.h using Plan A...
Hunk #1 succeeded at 95.
Hunk #2 succeeded at 135.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/ngfunc.c mpd-3.18/src/ngfunc.c
|--- mpd-3.18.orig/src/ngfunc.c Tue May 4 22:12:28 2004
|+++ mpd-3.18/src/ngfunc.c Fri May 14 13:43:59 2004
--------------------------
Patching file mpd-3.18/src/ngfunc.c using Plan A...
Hunk #1 succeeded at 215.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/radius.c mpd-3.18/src/radius.c
|--- mpd-3.18.orig/src/radius.c Tue May 4 22:12:28 2004
|+++ mpd-3.18/src/radius.c Fri May 14 13:51:33 2004
--------------------------
Patching file mpd-3.18/src/radius.c using Plan A...
Hunk #1 succeeded at 17.
Hunk #2 succeeded at 36.
Hunk #3 succeeded at 47.
Hunk #4 succeeded at 69.
Hunk #5 succeeded at 174.
Hunk #6 succeeded at 326.
Hunk #7 succeeded at 389.
Hunk #8 succeeded at 1066.
Hunk #9 succeeded at 1152.
Hunk #10 succeeded at 1216.
Hunk #11 succeeded at 1230.
Hunk #12 succeeded at 1355.
Hunk #13 succeeded at 1482.
Hunk #14 succeeded at 1696.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/radius.h mpd-3.18/src/radius.h
|--- mpd-3.18.orig/src/radius.h Tue May 4 22:12:28 2004
|+++ mpd-3.18/src/radius.h Fri May 14 13:49:35 2004
--------------------------
Patching file mpd-3.18/src/radius.h using Plan A...
Hunk #1 succeeded at 61.
Hunk #2 succeeded at 106.
done

дальше делаю:

patch < mpd-3.18-sesson-traffic-limit.diff
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- radius.c.orig Sun Feb 6 11:47:37 2005
|+++ radius.c Sun Feb 6 11:59:46 2005
--------------------------
File to patch:

что не так я делаю?

Добавлено: Сб сен 09, 2006 4:30 pm
BECHA
кроме того, где-то в форуме набрел на сообщение, что нужно ставить патчи на mpd-3.18_2 а не на mpd-3.18_4. Но дело в том. что файл

http://abills.asmodeus.com.ua/soft/mpd-3.18.tar.gz

который предлагается качать на странице

http://abills.asmodeus.com.ua/wiki/doku ... ocs:mpd:ru

имеет туже контрольную сумму, что и файл mpd-3.18.tar.gz , находящийся в портах FreeBSD 6.1

>md5 /usr/ports/distfiles/mpd/mpd-3.18.tar.gz
MD5 (/usr/ports/distfiles/mpd/mpd-3.18.tar.gz) = 4fdd913870dc29f29eed8f0442cd54bb

точно такую же md5 имеет

~>wget http://abills.asmodeus.com.ua/soft/mpd-3.18.tar.gz
--20:28:58-- http://abills.asmodeus.com.ua/soft/mpd-3.18.tar.gz
=> `mpd-3.18.tar.gz'
Распознаётся abills.asmodeus.com.ua... 83.149.103.136
Устанавливается соединение с abills.asmodeus.com.ua|83.149.103.136|:80... соединение установлено.
Запрос HTTP послан, ожидается ответ... 200 OK
Длина: 329 479 (322K) [application/x-tar]

100%[====================================>] 329 479 139,79K/s

20:29:00 (139,39 KB/s) - `mpd-3.18.tar.gz' сохранён [329479/329479]

K6~>md5 mpd-3.18.tar.gz
MD5 (mpd-3.18.tar.gz) = 4fdd913870dc29f29eed8f0442cd54bb

Добавлено: Вс сен 10, 2006 12:12 pm
~AsmodeuS~
Когда ставите через порты фри бсд ещё свои патчи делает

Добавлено: Вс сен 10, 2006 12:45 pm
BECHA
пропатчил! но все равно не работает :(
рассказываю все по порядку, заодно может поможет кому не повторить моих ошибок :)

качаем дистриб mpd-3.18
распаковываем: ~>tar -zxf mpd-3.18.tar.gz

в папку mpd-3.18/src кладем два файла патчей
mpd-3.18-drop-user-1.diff и mpd-3.18-sesson-traffic-limit.diff
из архива kha0s-mpd.tar.gz который находится в папке soft дистрибутива Abills

идем в папку src дистрибутива mpd: cd mpd-3.18/src/

накладываем первый патч:

Код: Выделить всё

~/mpd-3.18/src>patch < mpd-3.18-drop-user-1.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/link.c mpd-3.18/src/link.c
|--- mpd-3.18.orig/src/link.c   Tue May  4 22:12:28 2004
|+++ mpd-3.18/src/link.c        Fri May 14 13:43:59 2004
--------------------------
Patching file link.c using Plan A...
Hunk #1 succeeded at 236.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/link.h mpd-3.18/src/link.h
|--- mpd-3.18.orig/src/link.h   Tue May  4 22:12:28 2004
|+++ mpd-3.18/src/link.h        Fri May 14 13:43:59 2004
--------------------------
Patching file link.h using Plan A...
Hunk #1 succeeded at 95.
Hunk #2 succeeded at 135.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/ngfunc.c mpd-3.18/src/ngfunc.c
|--- mpd-3.18.orig/src/ngfunc.c Tue May  4 22:12:28 2004
|+++ mpd-3.18/src/ngfunc.c      Fri May 14 13:43:59 2004
--------------------------
Patching file ngfunc.c using Plan A...
Hunk #1 succeeded at 215.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/radius.c mpd-3.18/src/radius.c
|--- mpd-3.18.orig/src/radius.c Tue May  4 22:12:28 2004
|+++ mpd-3.18/src/radius.c      Fri May 14 13:51:33 2004
--------------------------
Patching file radius.c using Plan A...
Hunk #1 succeeded at 17.
Hunk #2 succeeded at 36.
Hunk #3 succeeded at 47.
Hunk #4 succeeded at 69.
Hunk #5 succeeded at 174.
Hunk #6 succeeded at 326.
Hunk #7 succeeded at 389.
Hunk #8 succeeded at 1066.
Hunk #9 succeeded at 1152.
Hunk #10 succeeded at 1216.
Hunk #11 succeeded at 1230.
Hunk #12 succeeded at 1355.
Hunk #13 succeeded at 1482.
Hunk #14 succeeded at 1696.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNb mpd-3.18.orig/src/radius.h mpd-3.18/src/radius.h
|--- mpd-3.18.orig/src/radius.h Tue May  4 22:12:28 2004
|+++ mpd-3.18/src/radius.h      Fri May 14 13:49:35 2004
--------------------------
Patching file radius.h using Plan A...
Hunk #1 succeeded at 61.
Hunk #2 succeeded at 106.
done
накладываем второй патч:
~/mpd-3.18/src>patch < mpd-3.18-sesson-traffic-limit.diff
....
.....
done

выходим на уровень выше cd ..
и даем команду make а потом make install
создаем файл dictionary.mpd в любом удобном месте

Код: Выделить всё

~>cat /usr/local/etc/mpd/dictionary.mpd
################################
VENDOR          mpd             12341
################################
ATTRIBUTE       Drop-User       154             integer         mpd
VALUE           Drop-User       No              0
VALUE           Drop-User       Yes             1
#################################
VENDOR          Exppp           1976
#################################
ATTRIBUTE       Expp-Traffic-Limit      2       integer         Exppp
#
добавляем этот файл в список словари радиуса:

Код: Выделить всё

~>cat /usr/local/radiusd/etc/raddb/dictionary
$INCLUDE        /usr/local/radiusd//share/freeradius/dictionary
$INCLUDE        /usr/local/etc/mpd/dictionary.mpd
теперь ставим в параметрах сервера доступа:
тип: mpd с патчем
IP:port 127.0.0.1:10001

и запускаем mpd:

Код: Выделить всё

~>mpd -a 127.0.0.1 -c 10001
mpd -c 10001 -a 127.0.0.1
Multi-link PPP for FreeBSD, by Archie L. Cobbs.
Based on iij-ppp, by Toshiharu OHNO.
mpd: pid 719, version 3.18 (root@bsd.small 00:11 11-Sep-2006)
mpd: telnet console address is 127.0.0.1:10001
[pptp1] ppp node is "mpd719-pptp1"
[pptp1] using interface ng1
mpd: local IP address for PPTP is 192.168.0.200
пытаюсь коннектится - выдается первый свободный IP адрес (из тех, что разрешены в mpd.conf) а не тот, что указан в свойствах пользователя.

mpd при попытке соединения ругается вот так:

Код: Выделить всё

 [pptp1] RADIUS: using /usr/local/etc/mpd/radius.conf
[pptp1] RADIUS: RadiusAddServer Adding localhost
[pptp1] RADIUS: RadiusPutAuth: RADIUS_CHAP (MSOFTv2) peer name: 222
[pptp1] RADIUS: RadiusSendRequest: RAD_ACCESS_ACCEPT for user 222
[pptp1] RADIUS: RadiusGetParams: RAD_MICROSOFT_MS_CHAP2_SUCCESS: S=A2B6CCEED696148317E29687FD854DB9ECC3818F
[pptp1] RADIUS: RadiusGetParams: Dropping EXPPP vendor specific attribute: 26
[pptp1] RADIUS: RadiusGetParams: RAD_MICROSOFT_MS_MPPE_RECV_KEY
[pptp1] RADIUS: RadiusGetParams: Dropping EXPPP vendor specific attribute: 17
[pptp1] RADIUS: RadiusGetParams: RAD_MICROSOFT_MS_MPPE_SEND_KEY
[pptp1] RADIUS: RadiusGetParams: Dropping EXPPP vendor specific attribute: 16
[pptp1] RADIUS: RadiusGetParams: RAD_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY: 1 (Allowed)
[pptp1] RADIUS: RadiusGetParams: Dropping EXPPP vendor specific attribute: 7
[pptp1] RADIUS: RadiusGetParams: RAD_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES: 6 (40 128 bit)
[pptp1] RADIUS: RadiusGetParams: Dropping EXPPP vendor specific attribute: 8
[pptp1] RADIUS: RadiusSetAuth: Trying to use IP-address from radius-server
[pptp1] RADIUS: RadiusSetAuth: server says that the peer can choose an address
 Response is valid

Если поставить тип сервера other и запускать mpd без ключей, то адрес выдается правильный, т.е. тот что указан в Abills. Что я не так делаю? :cry: Объясните!

Добавлено: Пн сен 11, 2006 8:20 am
BECHA
нашел откуда ноги растут:
разница заметна с первых строк логов радиуса. коннектюсь клиентом, в свойствах которого указан адрес 10.0.0.100

кусок лога радиуса если nastype=other:

Код: Выделить всё

Exec-Program: /usr/abills/libexec/rauth.pl
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Exec-Program output: Session-Timeout = 45763, MS-MPPE-Encryption-Types = 0x00000006, Framed-IP-Address =
10.0.0.100, Framed-IP-Netmask = 255.255.255.255, MS-CHAP2-SUCCESS =
0x01533d42324438363434453441423535433433423233323946304537383834434639363946323433444130,
MS-CHAP-MPPE-Keys = 0xe8450c7e071129824559a6f6bc8f4dd1c38bad730d9935420000000000000000,
MS-MPPE-Encryption-Policy = 0x00000001,
Exec-Program-Wait: value-pairs: Session-Timeout = 45763, MS-MPPE-Encryption-Types = 0x00000006,
Framed-IP-Address = 10.0.0.100, Framed-IP-Netmask = 255.255.255.255, MS-CHAP2-SUCCESS =
0x01533d42324438363434453441423535433433423233323946304537383834434639363946323433444130,
MS-CHAP-MPPE-Keys = 0xe8450c7e071129824559a6f6bc8f4dd1c38bad730d9935420000000000000000,
MS-MPPE-Encryption-Policy = 0x00000001,
Exec-Program: returned: 0
Sending Access-Accept of id 19 to 127.0.0.1 port 60138
        MS-CHAP2-Success =
0x01533d42324438363434453441423535433433423233323946304537383834434639363946323433444130
        MS-MPPE-Recv-Key = 0xaf71e0e4f85c240eb696d6f796a5a13b
        MS-MPPE-Send-Key = 0xf5d225764850da2acd921c071e0364f7
        MS-MPPE-Encryption-Policy = 0x00000001
        MS-MPPE-Encryption-Types = 0x00000006
        Session-Timeout = 45763
        Framed-IP-Address = 10.0.0.100
        Framed-IP-Netmask = 255.255.255.255
        MS-CHAP-MPPE-Keys = 0xe8450c7e071129824559a6f6bc8f4dd1c38bad730d9935420000000000000000
Finished request 0
кусок лога радиуса, когда коннектюсь с NAStype=mpd

Код: Выделить всё

Exec-Program: /usr/abills/libexec/rauth.pl
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Character in 'C' format wrapped in pack at /usr/abills/libexec/..//Abills/DES.pm line 550.
Exec-Program output: Session-Timeout = 44674, MS-MPPE-Encryption-Types = 0x00000006, MS-CHAP2-SUCCESS =
0x01533d31423543353030334130454538423239304632303732314435373938303034443741363239313644,
MS-MPPE-Encryption-Policy = 0x00000001, Exppp-Traffic-Limit = 1048576, Framed-IP-Address = 10.0.0.100,
Framed-IP-Netmask = 255.255.255.255, MS-CHAP-MPPE-Keys =
0xe8450c7e071129824559a6f6bc8f4dd1c38bad730d9935420000000000000000,
Exec-Program-Wait: plaintext: Session-Timeout = 44674, MS-MPPE-Encryption-Types = 0x00000006,
MS-CHAP2-SUCCESS =
0x01533d31423543353030334130454538423239304632303732314435373938303034443741363239313644,
MS-MPPE-Encryption-Policy = 0x00000001, Exppp-Traffic-Limit = 1048576, Framed-IP-Address = 10.0.0.100,
Framed-IP-Netmask = 255.255.255.255, MS-CHAP-MPPE-Keys =
0xe8450c7e071129824559a6f6bc8f4dd1c38bad730d9935420000000000000000,
Exec-Program: returned: 0
Sending Access-Accept of id 141 to 127.0.0.1 port 57838
        MS-CHAP2-Success =
0x01533d31423543353030334130454538423239304632303732314435373938303034443741363239313644
        MS-MPPE-Recv-Key = 0xfb552d16ebb896e704ef3ee10b35df68
        MS-MPPE-Send-Key = 0x6e0bec7dd6aa0bd625680acd6a6c1e2d
        MS-MPPE-Encryption-Policy = 0x00000001
        MS-MPPE-Encryption-Types = 0x00000006
Finished request 0
нету адреса! куда он пропал?

Добавлено: Пн сен 11, 2006 8:58 am
~AsmodeuS~
к радиусу плохо прикрутили словарь

всё что после атрибута Exppp-Traffic-Limit обрезается

Добавлено: Пн сен 11, 2006 1:07 pm
BECHA
~AsmodeuS~ писал(а):к радиусу плохо прикрутили словарь

всё что после атрибута Exppp-Traffic-Limit обрезается
я нашел свою ошибку! спасибо за помошь! я, растяпа, написал Expp вместо Exppp.
вот так должен выглядеть словарь:

Код: Выделить всё

VENDOR          mpd             12341
ATTRIBUTE       Drop-User       154             integer         mpd
VALUE           Drop-User       No              0
VALUE           Drop-User       Yes             1
VENDOR          Exppp           1976
ATTRIBUTE       Exppp-Traffic-Limit     2       integer Exppp
поля разделять ТОЛЬКО ТАБУЛЯЦИЕЙ! никаких пробелов!
Часовой пояс: UTC
Страница 1 из 1

Создано на основе phpBB® Forum Software © phpBB Limited

Русская поддержка phpBB